[Mesa-dev] [PATCH 9/9] glsl: Never allow the sequence operator anywhere in an array size

Ian Romanick idr at freedesktop.org
Fri Oct 9 19:00:07 PDT 2015


On 10/09/2015 06:53 PM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 

Forgot to add:

    Fixes:
    
        spec/glsl-1.20/compiler/structure-and-array-operations/array-size-sequence-in-parenthesis.vert
        spec/glsl-es-1.00/compiler/array-sized-by-sequence-in-parenthesis.vert
        spec/glsl-es-3.00/compiler/array-sized-by-sequence-in-parenthesis.vert

> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/glsl/ast_to_hir.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> index f34cbe0..a21f25c 100644
> --- a/src/glsl/ast_to_hir.cpp
> +++ b/src/glsl/ast_to_hir.cpp
> @@ -2069,7 +2069,7 @@ process_array_size(exec_node *node,
>     }
>  
>     ir_constant *const size = ir->constant_expression_value();
> -   if (size == NULL) {
> +   if (size == NULL || array_size->has_sequence_subexpression()) {
>        _mesa_glsl_error(& loc, state, "array size must be a "
>                         "constant valued expression");
>        return 0;
> 



More information about the mesa-dev mailing list