From a2ca0c0430433893876179a39f85a428862eabb2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 12 Dec 2008 13:18:30 -0700
Subject: mesa: array size fix in _slang_typeof_operation()

(cherry picked from commit 87a00959ba40ee0aeaebbc8a86ca081cf3b81c75)
---
 src/mesa/shader/slang/slang_typeinfo.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/mesa/shader/slang/slang_typeinfo.c')

diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/shader/slang/slang_typeinfo.c
index 3978df751d..bd135c1a11 100644
--- a/src/mesa/shader/slang/slang_typeinfo.c
+++ b/src/mesa/shader/slang/slang_typeinfo.c
@@ -600,7 +600,15 @@ _slang_typeof_operation(slang_operation * op,
             return GL_FALSE;
          }
          ti->can_be_referenced = GL_TRUE;
-         ti->array_len = var->array_len;
+         if (var->type.specifier.type == SLANG_SPEC_ARRAY &&
+             var->type.array_len >= 1) {
+            /* the datatype is an array, ex: float[3] x; */
+            ti->array_len = var->type.array_len;
+         }
+         else {
+            /* the variable is an array, ex: float x[3]; */
+            ti->array_len = var->array_len;
+         }
       }
       break;
    case SLANG_OPER_SEQUENCE:
-- 
cgit v1.2.3