From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 22 Jun 2014 11:53:59 +0000 (+1200)
Subject: Partially revert "glsl: Add builtin define for ARB_fragment_layer_viewport"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8b2e0ddf8a0e8a9b30fccf07051fbf20c1798c0d;p=mesa.git

Partially revert "glsl: Add builtin define for ARB_fragment_layer_viewport"

This partially reverts commit cc18b1ec2161c846109e921d7821dfeef7a06f3a,
which dropped some unrelated code due to a fumbled rebase.
---

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 58843a73ac3..d8c395778ab 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2147,6 +2147,12 @@ _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);
 	   }
 	}