From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Wed, 27 May 2015 11:33:45 +0000 (+1000)
Subject: glsl: validate binding qualifier for AoA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d401f9ce48f85b4340fcd4a591222aa165910f1;p=mesa.git

glsl: validate binding qualifier for AoA

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 6b2e140cf43..b8d66dd0609 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2179,7 +2179,7 @@ validate_binding_qualifier(struct _mesa_glsl_parse_state *state,
    }
 
    const struct gl_context *const ctx = state->ctx;
-   unsigned elements = type->is_array() ? type->length : 1;
+   unsigned elements = type->is_array() ? type->arrays_of_arrays_size() : 1;
    unsigned max_index = qual->binding + elements - 1;
    const glsl_type *base_type = type->without_array();