Mesa (master): glsl: Add builtin define for ARB_fragment_layer_viewport

[Chris Forbes]

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

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sat Jan 25 18:24:38 2014 +1300

glsl: Add builtin define for ARB_fragment_layer_viewport

The spec doesn't actually mention adding this, but this is the usual
pattern so I'm assuming it's a spec bug.

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/glcpp/glcpp-parse.y |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index dacb954..58843a7 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2086,6 +2086,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 	         add_builtin_define(parser, "GL_ARB_fragment_coord_conventions",
 				    1);
 
+              if (extensions->ARB_fragment_layer_viewport)
+                 add_builtin_define(parser, "GL_ARB_fragment_layer_viewport", 1);
+
 	      if (extensions->ARB_explicit_attrib_location)
 	         add_builtin_define(parser, "GL_ARB_explicit_attrib_location", 1);
 
@@ -2144,12 +2147,6 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 
 	      if (extensions->ARB_viewport_array)
 	         add_builtin_define(parser, "GL_ARB_viewport_array", 1);
-
-              if (extensions->ARB_compute_shader)
-                 add_builtin_define(parser, "GL_ARB_compute_shader", 1);
-
-	      if (extensions->ARB_shader_image_load_store)
-	         add_builtin_define(parser, "GL_ARB_shader_image_load_store", 1);
 	   }
 	}