Mesa (master): glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.

[Matt Turner]

Module: Mesa
Branch: master
Commit: 66ef8feb4df2780e06c92c43b6523623aaa1b2eb
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=66ef8feb4df2780e06c92c43b6523623aaa1b2eb

Author: Matt Turner <matts...@gmail.com>
Date:   Fri Jan 17 14:32:19 2014 -0800

glcpp: Define GL_EXT_shader_integer_mix in both GL and ES.

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

---

 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 89436d1..184e5c2 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);
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit