[Mesa-dev] [PATCH] glsl/lower_distance: only set max_array_access for 1D clip dist arrays

[Timothy Arceri]

On 12/06/17 09:47, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> The max_array_access field applies to the first dimension, which means
> we only want to set it for the 1D clip dist arrays.
> 
> This fixes an ir_validate assert seen with
> KHR-GL44.cull_distance.functional
> on nouveau and radeon with debug builds.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>   src/compiler/glsl/lower_distance.cpp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/compiler/glsl/lower_distance.cpp b/src/compiler/glsl/lower_distance.cpp
> index 9858503..ff04e9a 100644
> --- a/src/compiler/glsl/lower_distance.cpp
> +++ b/src/compiler/glsl/lower_distance.cpp
> @@ -167,7 +167,6 @@ lower_distance_visitor::visit(ir_variable *ir)
>         /* Clone the old var so that we inherit all of its properties */
>         *new_var = ir->clone(ralloc_parent(ir), NULL);
>         (*new_var)->name = ralloc_strdup(*new_var, GLSL_CLIP_VAR_NAME);
> -      (*new_var)->data.max_array_access = new_size - 1;
>         (*new_var)->data.location = VARYING_SLOT_CLIP_DIST0;
>   
>         if (!ir->type->fields.array->is_array()) {
> @@ -182,6 +181,7 @@ lower_distance_visitor::visit(ir_variable *ir)
>                     this->shader_stage == MESA_SHADER_GEOMETRY)));
>   
>            assert (ir->type->fields.array == glsl_type::float_type);
> +         (*new_var)->data.max_array_access = new_size - 1;

Why do we need to set this at all? As far as I can tell the only user is 
update_array_sizes() which creates a new array instance type, but we are 
doing that below anyway.

The other thing it does is update the number of state slot via 
var->set_num_state_slots(). Is this something we need to do for 2D 
arrays also? I'm not sure.

>   
>            /* And change the properties that we need to change */
>            (*new_var)->type = glsl_type::get_array_instance(glsl_type::vec4_type,
>