From 8c211dd742669bc03b44186e41e5aa40081d6bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Fri, 26 Jul 2013 10:21:56 +0300 Subject: glsl: disable ARB_texture_cube_map_array_enable keywords for glsl es MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch fixes a crash with Webgl 'shader-with-non-reserved-words' conformance test by ignoring desktop extension keywords on GLSL ES. v2: fix reserved and allowed desktop glsl versions (Chris) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64087 Signed-off-by: Tapani Pälli Reviewed-by: Chris Forbes Reviewed-by: Kenneth Graunke --- src/glsl/glsl_lexer.ll | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'src/glsl') diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll index dbc8154..145119c 100644 --- a/src/glsl/glsl_lexer.ll +++ b/src/glsl/glsl_lexer.ll @@ -324,30 +324,11 @@ sampler2DMSArray KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multi isampler2DMSArray KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, ISAMPLER2DMSARRAY); usampler2DMSArray KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, USAMPLER2DMSARRAY); -samplerCubeArray { - if (yyextra->ARB_texture_cube_map_array_enable) - return SAMPLERCUBEARRAY; - else - return IDENTIFIER; - } -isamplerCubeArray { - if (yyextra->ARB_texture_cube_map_array_enable) - return ISAMPLERCUBEARRAY; - else - return IDENTIFIER; - } -usamplerCubeArray { - if (yyextra->ARB_texture_cube_map_array_enable) - return USAMPLERCUBEARRAY; - else - return IDENTIFIER; - } -samplerCubeArrayShadow { - if (yyextra->ARB_texture_cube_map_array_enable) - return SAMPLERCUBEARRAYSHADOW; - else - return IDENTIFIER; - } + /* keywords available with ARB_texture_cube_map_array_enable extension on desktop GLSL */ +samplerCubeArray KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAY); +isamplerCubeArray KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, ISAMPLERCUBEARRAY); +usamplerCubeArray KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, USAMPLERCUBEARRAY); +samplerCubeArrayShadow KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAYSHADOW); samplerExternalOES { if (yyextra->OES_EGL_image_external_enable) -- cgit v1.1