From: Carl Worth <cworth@cworth.org>
Date: Mon, 26 Nov 2012 23:00:05 +0000 (-0800)
Subject: glcpp: Make undefined macros illegal in #if and #elif for GLES3
X-Git-Tag: mesa-9.1-rc1~457
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93e719ba4da7c45cdddd276060acbcc1a4edceda;p=platform%2Fupstream%2Fmesa.git

glcpp: Make undefined macros illegal in #if and #elif for GLES3

Simply emitting a nicely-formatted error message if any undefined macro is
encountered in a parser context expecting an expression.

With this commit, the following piglit test now passes:

	spec/glsl-es-3.00/compiler/undefined-macro.vert

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 76dcd42..8fba923 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -363,6 +363,8 @@ integer_constant:
 expression:
 	integer_constant
 |	IDENTIFIER {
+		if (parser->is_gles)
+			glcpp_error(& @1, parser, "undefined macro %s in expression (illegal in GLES)", $1);
 		$$ = 0;
 	}
 |	expression OR expression {