[Mesa-dev] [PATCH v4 (part2) 46/59] glsl: Allow use of memory qualifiers with ARB_shader_storage_buffer_object.

[Iago Toral]

Thanks Tapani, I'll look into this as soon as I get back from holidays. 
The implementation has changed slightly since I sent these patches too 
btw.

Iago

El 2015-08-13 10:05, Tapani Pälli escribió:
> 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
> 
> 
> 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);
>> 
>>