[Mesa-dev] [PATCH] glsl/glcpp: allow undefining __VERSION__ and GL_

Dave Airlie airlied at gmail.com
Tue Aug 25 23:38:59 PDT 2015


From: Dave Airlie <airlied at redhat.com>

GL33-CTS.shaders.preprocessor.definitions.*
has 4 tests the undefine these,

I can't find anything in the spec saying that isn't correct.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/glsl/glcpp/glcpp-parse.y | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 18e50af..77010b4 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -289,9 +289,7 @@ control_line_success:
 	} IDENTIFIER NEWLINE {
 		macro_t *macro;
 		if (strcmp("__LINE__", $4) == 0
-		    || strcmp("__FILE__", $4) == 0
-		    || strcmp("__VERSION__", $4) == 0
-		    || strncmp("GL_", $4, 3) == 0)
+		    || strcmp("__FILE__", $4) == 0)
 			glcpp_error(& @1, parser, "Built-in (pre-defined)"
 				    " macro names cannot be undefined.");
 
-- 
2.4.3



More information about the mesa-dev mailing list