[Mesa-dev] [PATCH] glsl: Take 'double' as reserved after GLSL ES 1.0

[Ilia Mirkin]

On Wed, Jun 6, 2018 at 4:11 AM, Kenneth Graunke <kenneth at whitecape.org> wrote:
> On Monday, June 4, 2018 2:33:59 PM PDT zhaowei yuan wrote:
>> GLSL ES 1.0.17 specifies that "double" is a keyword reserved
>>
>> Signed-off-by: zhaowei yuan <zhaowei.yuan at samsung.com>
>> ---
>>  src/compiler/glsl/glsl_lexer.ll | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
>> index b7cf100..de6dc64 100644
>> --- a/src/compiler/glsl/glsl_lexer.ll
>> +++ b/src/compiler/glsl/glsl_lexer.ll
>> @@ -600,7 +600,7 @@ external  KEYWORD(110, 100, 0, 0, EXTERNAL);
>>  interface    KEYWORD(110, 100, 0, 0, INTERFACE);
>>  long         KEYWORD(110, 100, 0, 0, LONG_TOK);
>>  short                KEYWORD(110, 100, 0, 0, SHORT_TOK);
>> -double               TYPE_WITH_ALT(130, 300, 130, 300, yyextra->ARB_gpu_shader_fp64_enable, glsl_type::double_type);
>> +double               TYPE_WITH_ALT(130, 100, 130, 300, yyextra->ARB_gpu_shader_fp64_enable, glsl_type::double_type);

That should probably be TYPE_WITH_ALT(110, 100, 400, 0, ...) no?

>>  half         KEYWORD(110, 100, 0, 0, HALF);
>>  fixed                KEYWORD(110, 100, 0, 0, FIXED_TOK);
>>  unsigned     KEYWORD(110, 100, 0, 0, UNSIGNED);
>>
>
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
>
> Pushed:
>
> To ssh://git.freedesktop.org/git/mesa/mesa
>    17a42062ccd..67f7a16b598  master -> master
>
> Thanks for the patch!
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>