glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 89436d138155392c268dac34e49d9932e5f821ec..184e5c23770ae3cf458325b6a2dd45d13dc48848 100644 (file)
--- 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);