From 5e918a3825ac34c1fc6e3d498adbfbe6e1001b47 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 27 Nov 2012 12:18:02 -0800 Subject: [PATCH] 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 Reviewed-by: Carl Worth --- src/glsl/glcpp/glcpp-lex.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index fd28711d12c..a029f620367 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; } -- 2.11.0