Module: Mesa Branch: master Commit: 5e918a3825ac34c1fc6e3d498adbfbe6e1001b47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e918a3825ac34c1fc6e3d498adbfbe6e1001b47
Author: Matt Turner <[email protected]> Date: Tue Nov 27 12:18:02 2012 -0800 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 <[email protected]> Reviewed-by: Carl Worth <[email protected]> --- src/glsl/glcpp/glcpp-lex.l | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
