diff options
| author | Ian Romanick <[email protected]> | 2013-09-12 11:40:00 -0500 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2013-09-13 09:56:36 -0500 |
| commit | ea373f03e8d7783f70c78f700cd80032fd6dc8c4 (patch) | |
| tree | 4dda0ef09ceae00efe4adf59c0bc2ec538e7aa95 /src/glsl | |
| parent | f4e35f897e148eff3a2fc35fc48150321f8ab177 (diff) | |
mesa: Rename MESA_shader_integer_mix to EXT_shader_integer_mix
Everyone at the Khronos meeting was as surprised that GLSL didn't
already support this as we were. Several vendors said they'd ship it,
but there didn't seem to be enough interest to put in the effort to make
it ARB or KHR.
v2: Fix a couple typos and rename the spec file to
EXT_shader_integer_mix.spec. Suggested by Roland.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/builtin_functions.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/glcpp/glcpp-parse.y | 4 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index eb661f115ee..c468bd505ab 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl/builtin_functions.cpp @@ -190,7 +190,7 @@ shader_bit_encoding(const _mesa_glsl_parse_state *state) static bool shader_integer_mix(const _mesa_glsl_parse_state *state) { - return v130(state) && state->MESA_shader_integer_mix_enable; + return v130(state) && state->EXT_shader_integer_mix_enable; } static bool diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index fb1c1d0466d..6eaa5f95ef1 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -1246,8 +1246,8 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) if (extensions->ARB_shading_language_420pack) add_builtin_define(parser, "GL_ARB_shading_language_420pack", 1); - if (extensions->MESA_shader_integer_mix) - add_builtin_define(parser, "GL_MESA_shader_integer_mix", 1); + if (extensions->EXT_shader_integer_mix) + add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1); } } diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 1e4d7c7abf0..cac5a18e474 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -517,7 +517,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(ARB_texture_query_lod, true, false, ARB_texture_query_lod), EXT(ARB_gpu_shader5, true, false, ARB_gpu_shader5), EXT(AMD_vertex_shader_layer, true, false, AMD_vertex_shader_layer), - EXT(MESA_shader_integer_mix, true, true, MESA_shader_integer_mix), + EXT(EXT_shader_integer_mix, true, true, EXT_shader_integer_mix), }; #undef EXT diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 15abbbc9916..2e2440a9eed 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -315,8 +315,8 @@ struct _mesa_glsl_parse_state { bool AMD_vertex_shader_layer_warn; bool ARB_shading_language_420pack_enable; bool ARB_shading_language_420pack_warn; - bool MESA_shader_integer_mix_enable; - bool MESA_shader_integer_mix_warn; + bool EXT_shader_integer_mix_enable; + bool EXT_shader_integer_mix_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ |