fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: remove unused dri config option disable_shader_bit_encoding

Browse source 
This was added as a workaround for Heaven 3.0 but was later removed
by 5ead448719 to allow Heaven 4.0 to work correctly.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri 2018-08-15 14:22:29 +10:00
parent c5f863f2fd
commit 02062ab1e1
12 changed files with 1 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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")

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

@ -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;

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

@ -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 =

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

@ -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,

4
src/mesa/state_tracker/st_extensions.c
View file

@ -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;

4
src/util/xmlpool/ca.po
View file

@ -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"

4
src/util/xmlpool/de.po
View file

@ -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"

4
src/util/xmlpool/es.po
View file

@ -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"

4
src/util/xmlpool/fr.po
View file

@ -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"

4
src/util/xmlpool/nl.po
View file

@ -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"

4
src/util/xmlpool/sv.po
View file

@ -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"

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

@ -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")) \