[Mesa-dev] [PATCH] glsl: Allow token pasting in ESSL

[Ryan Houdek]

All vendors I've tested allow token pasting in their ESSL shaders.
At least one application expects this to be supported
even though it is against spec.
This would be the Dolphin GameCube/Wii emulator that requires this.
The vendors I've tested that is known to support this is:
ARM Mali
Qualcomm Adreno
IMGTec PowerVR
Nvidia Tegra K1/X1

The vendors that I don't have access to testing:
Intel Android
Vivante
---
 src/glsl/glcpp/glcpp-lex.l | 2 --
 1 file changed, 2 deletions(-)

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