From b49a069bd3c96c8a144bb671863d0757fb421a07 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 30 Nov 2014 09:54:59 +1300 Subject: [PATCH] glcpp: Disallow undefining GL_* builtin macros. Fixes the piglit test: spec/glsl-es-3.00/compiler/undef-GL_ES.vert Signed-off-by: Chris Forbes Reviewed-by: Anuj Phogat Reviewed-by: Ian Romanick --- src/glsl/glcpp/glcpp-parse.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index f1119eb805a..287792439b5 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -290,7 +290,8 @@ control_line_success: macro_t *macro; if (strcmp("__LINE__", $4) == 0 || strcmp("__FILE__", $4) == 0 - || strcmp("__VERSION__", $4) == 0) + || strcmp("__VERSION__", $4) == 0 + || strncmp("GL_", $4, 3) == 0) glcpp_error(& @1, parser, "Built-in (pre-defined)" " macro names can not be undefined."); -- 2.30.2