[Mesa-dev] [PATCH] glsl: allow standalone semicolons outside main()

Timothy Arceri tarceri at itsqueeze.com
Wed Jun 13 23:58:42 UTC 2018



On 14/06/18 09:53, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> GLSL 4.60 offically added this but games and older CTS suites actually
> had shaders that did this, we may as well enable it everywhere.
> ---
>   src/compiler/glsl/glsl_parser.yy | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
> index 91c10ce1a60..432fc874268 100644
> --- a/src/compiler/glsl/glsl_parser.yy
> +++ b/src/compiler/glsl/glsl_parser.yy
> @@ -2706,6 +2706,7 @@ external_declaration:
>      | declaration            { $$ = $1; }
>      | pragma_statement       { $$ = NULL; }
>      | layout_defaults        { $$ = $1; }
> +   | ';' { $$ = NULL; }

Should the $$ stuff be aligned with above? Otherwise:

Acked-by: Timothy Arceri <tarceri at itsqueeze.com>

>      ;
>   
>   function_definition:
> 


More information about the mesa-dev mailing list