[Mesa-stable] [PATCH 5/5] glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.

[Matt Turner]

Cc: mesa-stable at lists.freedesktop.org
---
 src/glsl/glcpp/glcpp-parse.y | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 427fdec..995427a 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2100,9 +2100,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);
 
@@ -2114,6 +2111,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);
 
-- 
1.8.3.2