From: Matt Turner <mattst88@gmail.com>
Date: Tue, 27 Nov 2012 20:18:02 +0000 (-0800)
Subject: glcpp: Reject token pasting operator in GLES
X-Git-Tag: mesa-9.1-rc1~456
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e918a3825ac34c1fc6e3d498adbfbe6e1001b47;p=platform%2Fupstream%2Fmesa.git

glcpp: Reject token pasting operator in GLES

The GLSL ES 3.0 spec (Section 12.17) says:
"GLSL ES 1.00 removed token pasting and other functionality."

NOTE: This is a candidate for the stable branches.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
---

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index fd28711..a029f62 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -260,6 +260,8 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 }
 
 "##" {
+	if (parser->is_gles)
+		glcpp_error(yylloc, yyextra, "Token pasting (##) is illegal in GLES");
 	return PASTE;
 }