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

Author: Chris Forbes <[email protected]>
Date:   Sun Jun 22 23:53:59 2014 +1200

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.

---

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

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 58843a7..d8c3957 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);
           }
        }
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to