[Mesa-dev] [PATCH 1/5] glsl/linker: Use correct array length when linking inter-stage uniforms and varyings.

[Ian Romanick]

On 06/03/2013 01:23 PM, Fabian Bieler wrote:
> Signed-off-by: Fabian Bieler <fabianbieler at fastmail.fm>
> ---
>   src/glsl/linker.cpp | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
> index 982fe46..7395ed5 100644
> --- a/src/glsl/linker.cpp
> +++ b/src/glsl/linker.cpp
> @@ -1147,7 +1147,7 @@ update_array_sizes(struct gl_shader_program *prog)
>   	    }
>   	 }
>
> -	 if (size + 1 != var->type->fields.array->length) {
> +	 if (size + 1 != var->type->length) {
>   	    /* If this is a built-in uniform (i.e., it's backed by some
>   	     * fixed-function state), adjust the number of state slots to
>   	     * match the new array size.  The number of slots per array entry
>

I believe that Paul Berry also noticed this problem recently.  I believe 
this change is correct.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>