On 13/08/15 10:05, Tapani Pälli wrote: > Hi; > > I believe something more needs to be done here, it may be generic > changes to the memory qualifier parsing. I wrote a Piglit test that > fails with these changes (I tested against > itoral-ARB_shader_storage_buffer_object-v4.1 branch), here: > > http://lists.freedesktop.org/archives/piglit/2015-August/016777.html > >
As Iago is on holidays, I will analyse what is wrong or missing, once I have some free time. Thanks for reporting it, Sam > On 08/05/2015 11:30 AM, Iago Toral Quiroga wrote: >> --- >> src/glsl/glsl_lexer.ll | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/src/glsl/glsl_lexer.ll b/src/glsl/glsl_lexer.ll >> index efa0bb6..b9d700a 100644 >> --- a/src/glsl/glsl_lexer.ll >> +++ b/src/glsl/glsl_lexer.ll >> @@ -405,11 +405,11 @@ image2DShadow KEYWORD(130, 300, 0, 0, >> IMAGE2DSHADOW); >> image1DArrayShadow KEYWORD(130, 300, 0, 0, IMAGE1DARRAYSHADOW); >> image2DArrayShadow KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW); >> >> -coherent KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable, COHERENT); >> -volatile KEYWORD_WITH_ALT(110, 100, 420, 0, >> yyextra->ARB_shader_image_load_store_enable, VOLATILE); >> -restrict KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable, RESTRICT); >> -readonly KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable, READONLY); >> -writeonly KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable, WRITEONLY); >> +coherent KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable || >> yyextra->ARB_shader_storage_buffer_object_enable, COHERENT); >> +volatile KEYWORD_WITH_ALT(110, 100, 420, 0, >> yyextra->ARB_shader_image_load_store_enable || >> yyextra->ARB_shader_storage_buffer_object_enable, VOLATILE); >> +restrict KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable || >> yyextra->ARB_shader_storage_buffer_object_enable, RESTRICT); >> +readonly KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable || >> yyextra->ARB_shader_storage_buffer_object_enable, READONLY); >> +writeonly KEYWORD_WITH_ALT(420, 300, 420, 0, >> yyextra->ARB_shader_image_load_store_enable || >> yyextra->ARB_shader_storage_buffer_object_enable, WRITEONLY); >> >> atomic_uint KEYWORD_WITH_ALT(420, 300, 420, 310, >> yyextra->ARB_shader_atomic_counters_enable, ATOMIC_UINT); >> >> > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
