OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove force_s3tc_enable driconf variable

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Matt Turner
2017-09-27 21:37:46 -07:00
parent dc546a7bb3
commit c17c47207b
8 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
View File

@@ -7,7 +7,6 @@ DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY DRI_CONF_SECTION_QUALITY
DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_PP_CELSHADE(0) DRI_CONF_PP_CELSHADE(0)
DRI_CONF_PP_NORED(0) DRI_CONF_PP_NORED(0)
DRI_CONF_PP_NOGREEN(0) DRI_CONF_PP_NOGREEN(0)

1
src/gallium/include/state_tracker/st_api.h
View File

@@ -246,7 +246,6 @@ struct st_config_options
boolean disable_shader_bit_encoding; boolean disable_shader_bit_encoding;
boolean force_glsl_extensions_warn; boolean force_glsl_extensions_warn;
unsigned force_glsl_version; unsigned force_glsl_version;
boolean force_s3tc_enable;
boolean allow_glsl_extension_directive_midshader; boolean allow_glsl_extension_directive_midshader;
boolean allow_glsl_builtin_variable_redeclaration; boolean allow_glsl_builtin_variable_redeclaration;
boolean allow_higher_compat_version; boolean allow_higher_compat_version;

2
src/gallium/state_trackers/dri/dri_screen.c
View File

@@ -72,8 +72,6 @@ dri_fill_st_options(struct dri_screen *screen)
driQueryOptionb(optionCache, "force_glsl_extensions_warn"); driQueryOptionb(optionCache, "force_glsl_extensions_warn");
options->force_glsl_version = options->force_glsl_version =
driQueryOptioni(optionCache, "force_glsl_version"); driQueryOptioni(optionCache, "force_glsl_version");
options->force_s3tc_enable =
driQueryOptionb(optionCache, "force_s3tc_enable");
options->allow_glsl_extension_directive_midshader = options->allow_glsl_extension_directive_midshader =
driQueryOptionb(optionCache, "allow_glsl_extension_directive_midshader"); driQueryOptionb(optionCache, "allow_glsl_extension_directive_midshader");
options->allow_glsl_builtin_variable_redeclaration = options->allow_glsl_builtin_variable_redeclaration =

1
src/gallium/state_trackers/osmesa/osmesa.c
View File

@@ -688,7 +688,6 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist)
attribs.options.disable_blend_func_extended = FALSE; attribs.options.disable_blend_func_extended = FALSE;
attribs.options.disable_glsl_line_continuations = FALSE; attribs.options.disable_glsl_line_continuations = FALSE;
attribs.options.disable_shader_bit_encoding = FALSE; attribs.options.disable_shader_bit_encoding = FALSE;
attribs.options.force_s3tc_enable = FALSE;
attribs.options.force_glsl_version = 0; attribs.options.force_glsl_version = 0;
osmesa_init_st_visual(&attribs.visual, osmesa_init_st_visual(&attribs.visual,

1
src/mesa/drivers/dri/i915/intel_screen.c
View File

@@ -67,7 +67,6 @@ DRI_CONF_BEGIN
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY DRI_CONF_SECTION_QUALITY
DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG DRI_CONF_SECTION_DEBUG
DRI_CONF_NO_RAST("false") DRI_CONF_NO_RAST("false")

2
src/mesa/drivers/dri/i965/intel_screen.c
View File

@@ -61,8 +61,6 @@ DRI_CONF_BEGIN
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY DRI_CONF_SECTION_QUALITY
DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_PRECISE_TRIG("false") DRI_CONF_PRECISE_TRIG("false")
DRI_CONF_OPT_BEGIN(clamp_max_samples, int, -1) DRI_CONF_OPT_BEGIN(clamp_max_samples, int, -1)

2
src/mesa/drivers/dri/radeon/radeon_screen.c
View File

@@ -86,7 +86,6 @@ DRI_CONF_BEGIN
DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0") DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0")
DRI_CONF_NO_NEG_LOD_BIAS("false") DRI_CONF_NO_NEG_LOD_BIAS("false")
DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
@@ -113,7 +112,6 @@ DRI_CONF_BEGIN
DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB) DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0") DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0")
DRI_CONF_NO_NEG_LOD_BIAS("false") DRI_CONF_NO_NEG_LOD_BIAS("false")
DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)

5
src/util/xmlpool/t_options.h
View File

@@ -172,11 +172,6 @@ DRI_CONF_OPT_BEGIN_B(no_neg_lod_bias, def) \
DRI_CONF_DESC(en,gettext("Forbid negative texture LOD bias")) \ DRI_CONF_DESC(en,gettext("Forbid negative texture LOD bias")) \
DRI_CONF_OPT_END DRI_CONF_OPT_END
#define DRI_CONF_FORCE_S3TC_ENABLE(def) \
DRI_CONF_OPT_BEGIN_B(force_s3tc_enable, def) \
DRI_CONF_DESC(en,gettext("Enable S3TC texture compression even if software support is not available")) \
DRI_CONF_OPT_END
#define DRI_CONF_PRECISE_TRIG(def) \ #define DRI_CONF_PRECISE_TRIG(def) \
DRI_CONF_OPT_BEGIN_B(precise_trig, def) \ DRI_CONF_OPT_BEGIN_B(precise_trig, def) \
DRI_CONF_DESC(en,gettext("Prefer accuracy over performance in trig functions")) \ DRI_CONF_DESC(en,gettext("Prefer accuracy over performance in trig functions")) \