From 02062ab1e152c9eff46ca9485237120656cc4d52 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 15 Aug 2018 14:22:29 +1000 Subject: [PATCH] mesa: remove unused dri config option disable_shader_bit_encoding This was added as a workaround for Heaven 3.0 but was later removed by 5ead448719f3 to allow Heaven 4.0 to work correctly. Reviewed-by: Kenneth Graunke --- src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 1 - src/gallium/include/state_tracker/st_api.h | 1 - src/gallium/state_trackers/dri/dri_screen.c | 2 -- src/gallium/state_trackers/osmesa/osmesa.c | 1 - src/mesa/state_tracker/st_extensions.c | 4 +--- src/util/xmlpool/ca.po | 4 ---- src/util/xmlpool/de.po | 4 ---- src/util/xmlpool/es.po | 4 ---- src/util/xmlpool/fr.po | 4 ---- src/util/xmlpool/nl.po | 4 ---- src/util/xmlpool/sv.po | 4 ---- src/util/xmlpool/t_options.h | 5 ----- 12 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h index 90dbf658a6d..b8f0fe64098 100644 --- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h @@ -20,7 +20,6 @@ DRI_CONF_SECTION_DEBUG DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") - DRI_CONF_DISABLE_SHADER_BIT_ENCODING("false") DRI_CONF_FORCE_GLSL_VERSION(0) DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_ALLOW_GLSL_BUILTIN_CONST_EXPRESSION("false") diff --git a/src/gallium/include/state_tracker/st_api.h b/src/gallium/include/state_tracker/st_api.h index 5b72c0afc99..8d386a82a63 100644 --- a/src/gallium/include/state_tracker/st_api.h +++ b/src/gallium/include/state_tracker/st_api.h @@ -218,7 +218,6 @@ struct st_config_options { boolean disable_blend_func_extended; boolean disable_glsl_line_continuations; - boolean disable_shader_bit_encoding; boolean force_glsl_extensions_warn; unsigned force_glsl_version; boolean allow_glsl_extension_directive_midshader; diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index e5bc47391e7..3e4de59a433 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -66,8 +66,6 @@ dri_fill_st_options(struct dri_screen *screen) driQueryOptionb(optionCache, "disable_blend_func_extended"); options->disable_glsl_line_continuations = driQueryOptionb(optionCache, "disable_glsl_line_continuations"); - options->disable_shader_bit_encoding = - driQueryOptionb(optionCache, "disable_shader_bit_encoding"); options->force_glsl_extensions_warn = driQueryOptionb(optionCache, "force_glsl_extensions_warn"); options->force_glsl_version = diff --git a/src/gallium/state_trackers/osmesa/osmesa.c b/src/gallium/state_trackers/osmesa/osmesa.c index 8baec0a0e44..e7e0ab13acb 100644 --- a/src/gallium/state_trackers/osmesa/osmesa.c +++ b/src/gallium/state_trackers/osmesa/osmesa.c @@ -689,7 +689,6 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist) attribs.options.force_glsl_extensions_warn = FALSE; attribs.options.disable_blend_func_extended = FALSE; attribs.options.disable_glsl_line_continuations = FALSE; - attribs.options.disable_shader_bit_encoding = FALSE; attribs.options.force_glsl_version = 0; osmesa_init_st_visual(&attribs.visual, diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index db08d5169af..a81c68dd53a 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1020,9 +1020,7 @@ void st_init_extensions(struct pipe_screen *screen, extensions->ARB_shading_language_420pack = GL_TRUE; extensions->ARB_texture_query_levels = GL_TRUE; - if (!options->disable_shader_bit_encoding) { - extensions->ARB_shader_bit_encoding = GL_TRUE; - } + extensions->ARB_shader_bit_encoding = GL_TRUE; extensions->EXT_shader_integer_mix = GL_TRUE; extensions->ARB_arrays_of_arrays = GL_TRUE; diff --git a/src/util/xmlpool/ca.po b/src/util/xmlpool/ca.po index 8a338c0e33c..6cfd8699a80 100644 --- a/src/util/xmlpool/ca.po +++ b/src/util/xmlpool/ca.po @@ -67,10 +67,6 @@ msgstr "" "Deshabilita les continuacions de línia basades en barra invertida en la font " "GLSL" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "Deshabilita el GL_ARB_shader_bit_encoding" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/de.po b/src/util/xmlpool/de.po index 9b7059ba8ad..90a35e70dcf 100644 --- a/src/util/xmlpool/de.po +++ b/src/util/xmlpool/de.po @@ -46,10 +46,6 @@ msgstr "" msgid "Disable backslash-based line continuations in GLSL source" msgstr "" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/es.po b/src/util/xmlpool/es.po index baf6b6e2ec6..a087c0e1689 100644 --- a/src/util/xmlpool/es.po +++ b/src/util/xmlpool/es.po @@ -51,10 +51,6 @@ msgstr "" "Deshabilitar continuaciones de línea basadas en barra inversa en el código " "GLSL" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "Deshabilitar GL_ARB_shader_bit_encoding" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/fr.po b/src/util/xmlpool/fr.po index 23d8b4eaef9..8bcd08f9bf4 100644 --- a/src/util/xmlpool/fr.po +++ b/src/util/xmlpool/fr.po @@ -45,10 +45,6 @@ msgstr "" msgid "Disable backslash-based line continuations in GLSL source" msgstr "" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/nl.po b/src/util/xmlpool/nl.po index 8d3d2e11ea0..303d45517ff 100644 --- a/src/util/xmlpool/nl.po +++ b/src/util/xmlpool/nl.po @@ -45,10 +45,6 @@ msgstr "" msgid "Disable backslash-based line continuations in GLSL source" msgstr "" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/sv.po b/src/util/xmlpool/sv.po index 0b600174583..c60d1aaf226 100644 --- a/src/util/xmlpool/sv.po +++ b/src/util/xmlpool/sv.po @@ -45,10 +45,6 @@ msgstr "" msgid "Disable backslash-based line continuations in GLSL source" msgstr "" -#: t_options.h:100 -msgid "Disable GL_ARB_shader_bit_encoding" -msgstr "" - #: t_options.h:105 msgid "" "Force a default GLSL version for shaders that lack an explicit #version line" diff --git a/src/util/xmlpool/t_options.h b/src/util/xmlpool/t_options.h index fdb3a044771..f8623bd9f6d 100644 --- a/src/util/xmlpool/t_options.h +++ b/src/util/xmlpool/t_options.h @@ -90,11 +90,6 @@ DRI_CONF_OPT_BEGIN_B(disable_glsl_line_continuations, def) \ DRI_CONF_DESC(en,gettext("Disable backslash-based line continuations in GLSL source")) \ DRI_CONF_OPT_END -#define DRI_CONF_DISABLE_SHADER_BIT_ENCODING(def) \ -DRI_CONF_OPT_BEGIN_B(disable_shader_bit_encoding, def) \ - DRI_CONF_DESC(en,gettext("Disable GL_ARB_shader_bit_encoding")) \ -DRI_CONF_OPT_END - #define DRI_CONF_FORCE_GLSL_VERSION(def) \ DRI_CONF_OPT_BEGIN_V(force_glsl_version, int, def, "0:999") \ DRI_CONF_DESC(en,gettext("Force a default GLSL version for shaders that lack an explicit #version line")) \ -- 2.30.2