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 <kenneth@whitecape.org>

diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
index 90dbf658a6d58053693dfc1e92d47dbe683b2807..b8f0fe640982e78ff756f4bc9b1189e636711d14 100644 (file)
--- 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 5b72c0afc9948d7dba11e7c9ed31b24b72c3aba3..8d386a82a63c878854cd34092de22ce048655bfd 100644 (file)
--- 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 e5bc47391e73922dae2cafcc02b9cb90d7b10798..3e4de59a43340cadd56b03259e2df3d01f89a9ad 100644 (file)
--- 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 8baec0a0e44deb0162939a64851f5cbdd4ed1c57..e7e0ab13acb9c65e7923eb8e85325840db02e1f4 100644 (file)
--- 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 db08d5169af671ce1e7eff264a30dcdc9daea1ce..a81c68dd53aeb938389b49b2f10b8c9bf43f80b5 100644 (file)
--- 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 8a338c0e33cf9a68eca47530457d8e089fddd5b9..6cfd8699a806b1e077db6cc75e3a3c58d668da55 100644 (file)
--- 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 9b7059ba8adbed8f9ad41263a32446ced7b16861..90a35e70dcf870888dc0d86fe3469a876048b665 100644 (file)
--- 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 baf6b6e2ec63db2146d55b2e986e9bc7130a9825..a087c0e168998ce193462d2e301823c437d401dd 100644 (file)
--- 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 23d8b4eaef9980e680d6e7018243732a415386d4..8bcd08f9bf41aabc5014bf47662f3ad852884c0c 100644 (file)
--- 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 8d3d2e11ea01738b74b96268a4b4fca7d6e45336..303d45517ff9292537f42bfc13757d023ef8c00f 100644 (file)
--- 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 0b60017458364504e64a257d531d3eb25d445f7f..c60d1aaf22622bdce6e53b9dde965c027ac36e72 100644 (file)
--- 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 fdb3a04477178c60de6b94c66a9bba875145af39..f8623bd9f6de7627d038489f167cf3133922d6a3 100644 (file)
--- 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")) \