summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-01-17 14:32:19 -0800
committerMatt Turner <[email protected]>2014-01-23 11:33:22 -0800
commit66ef8feb4df2780e06c92c43b6523623aaa1b2eb (patch)
tree2a96928a1f6397a2237a7d1de751c350c926a141
parent73c3c7e37d973cac8a2da7f9c5bf97c25e24e88c (diff)
glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.
Cc: [email protected] Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/glsl/glcpp/glcpp-parse.y8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 89436d13815..184e5c23770 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2102,9 +2102,6 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
if (extensions->ARB_sample_shading)
add_builtin_define(parser, "GL_ARB_sample_shading", 1);
- if (extensions->EXT_shader_integer_mix)
- add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1);
-
if (extensions->ARB_texture_gather)
add_builtin_define(parser, "GL_ARB_texture_gather", 1);
@@ -2119,6 +2116,11 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
}
}
+ if (extensions != NULL) {
+ if (extensions->EXT_shader_integer_mix)
+ add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1);
+ }
+
if (version >= 150)
add_builtin_define(parser, "GL_core_profile", 1);