From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Thu, 23 Jan 2014 12:20:25 +0000 (+1100)
Subject: glsl: Allow arrays of arrays as input to vertex shader
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d492f19f6e1a50a645cfa3b04d64808d44af5e3;p=mesa.git

glsl: Allow arrays of arrays as input to vertex shader

Signed-off-by: Timothy Arceri <t_arceri@yahoo.com.au>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index be12f97c3be..f13ac51c164 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -3143,8 +3143,9 @@ ast_declarator_list::hir(exec_list *instructions,
              *    vectors. Vertex shader inputs cannot be arrays or
              *    structures."
 	     */
-	    const glsl_type *check_type = var->type->is_array()
-	       ? var->type->fields.array : var->type;
+            const glsl_type *check_type = var->type;
+            while (check_type->is_array())
+               check_type = check_type->element_type();
 
 	    switch (check_type->base_type) {
 	    case GLSL_TYPE_FLOAT: