Module: Mesa
Branch: main
Commit: a9b64bd7ad725fdf8ea0da522e1d47215cfb2f84
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9b64bd7ad725fdf8ea0da522e1d47215cfb2f84

Author: Tapani Pälli <[email protected]>
Date:   Fri Aug  5 09:15:04 2022 +0300

glsl: allow image*Shadow keywords on ES and GLSL >= 420

These were not reserved keywords in GLSL ES and also allowed on
desktop GLSL after 420. New CTS compiler tests will test this.

https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3007

Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17904>

---

 src/compiler/glsl/glsl_lexer.ll | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 34e175f8cde..3a54660523c 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -536,10 +536,10 @@ uimage2DArray   TYPE_WITH_ALT(130, 300, 420, 310, 
yyextra->ARB_shader_image_load
 uimageCubeArray TYPE_WITH_ALT(130, 300, 420, 320, 
yyextra->ARB_shader_image_load_store_enable || 
yyextra->EXT_shader_image_load_store_enable || 
yyextra->OES_texture_cube_map_array_enable || 
yyextra->EXT_texture_cube_map_array_enable, glsl_type::uimageCubeArray_type);
 uimage2DMS      TYPE_WITH_ALT(130, 300, 420, 0, 
yyextra->ARB_shader_image_load_store_enable || 
yyextra->EXT_shader_image_load_store_enable, glsl_type::uimage2DMS_type);
 uimage2DMSArray TYPE_WITH_ALT(130, 300, 420, 0, 
yyextra->ARB_shader_image_load_store_enable || 
yyextra->EXT_shader_image_load_store_enable, glsl_type::uimage2DMSArray_type);
-image1DShadow           KEYWORD(130, 300, 0, 0, IMAGE1DSHADOW);
-image2DShadow           KEYWORD(130, 300, 0, 0, IMAGE2DSHADOW);
-image1DArrayShadow      KEYWORD(130, 300, 0, 0, IMAGE1DARRAYSHADOW);
-image2DArrayShadow      KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW);
+image1DShadow           KEYWORD(130, 0, 420, 0, IMAGE1DSHADOW);
+image2DShadow           KEYWORD(130, 0, 420, 0, IMAGE2DSHADOW);
+image1DArrayShadow      KEYWORD(130, 0, 420, 0, IMAGE1DARRAYSHADOW);
+image2DArrayShadow      KEYWORD(130, 0, 420, 0, IMAGE2DARRAYSHADOW);
 
 coherent       KEYWORD_WITH_ALT(420, 300, 420, 310, 
yyextra->ARB_shader_image_load_store_enable || 
yyextra->EXT_shader_image_load_store_enable || 
yyextra->ARB_shader_storage_buffer_object_enable, COHERENT);
 volatile       KEYWORD_WITH_ALT(110, 100, 420, 310, 
yyextra->ARB_shader_image_load_store_enable || 
yyextra->EXT_shader_image_load_store_enable || 
yyextra->ARB_shader_storage_buffer_object_enable, VOLATILE);

Reply via email to