From: Eric Anholt <eric@anholt.net>
Date: Wed, 19 May 2010 20:38:15 +0000 (-0700)
Subject: Allow arrays of floats as varyings.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ca171908d04732176cbcaf2625fed8208a93dc9;p=mesa.git

Allow arrays of floats as varyings.

The comment just above the code said arrays were OK, then it didn't
handle arrays.  Whoops.  Partially fixes CorrectUnsizedArray.frat.
---

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index 8945bce6ee6..307e4483696 100644
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -1426,10 +1426,19 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
     *     float, vec2, vec3, vec4, mat2, mat3, and mat4, or arrays of
     *     these."
     */
-   if (qual->varying && var->type->base_type != GLSL_TYPE_FLOAT) {
-      var->type = glsl_type::error_type;
-      _mesa_glsl_error(loc, state,
-		       "varying variables must be of base type float");
+   if (qual->varying) {
+      const glsl_type *non_array_type;
+
+      if (var->type && var->type->is_array())
+	 non_array_type = var->type->fields.array;
+      else
+	 non_array_type = var->type;
+
+      if (non_array_type && non_array_type->base_type != GLSL_TYPE_FLOAT) {
+	 var->type = glsl_type::error_type;
+	 _mesa_glsl_error(loc, state,
+			  "varying variables must be of base type float");
+      }
    }
 
    if (qual->in && qual->out)