glsl: Use the column_types() helper method.
authorEric Anholt <eric@anholt.net>
Mon, 16 Apr 2012 16:15:36 +0000 (09:15 -0700)
committerEric Anholt <eric@anholt.net>
Thu, 19 Apr 2012 23:33:02 +0000 (16:33 -0700)
Ken noted this in a review of this patch that I pushed early.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/opt_array_splitting.cpp

index 5cf448b196dacaa4eac8ef7e269a8896dd19ff97..b9c70dc9006d632ff7cfec453ee7903b3059f4ab 100644 (file)
@@ -347,8 +347,7 @@ optimize_split_arrays(exec_list *instructions, bool linked)
       const struct glsl_type *subtype;
 
       if (type->is_matrix())
-        subtype = glsl_type::get_instance(GLSL_TYPE_FLOAT,
-                                          type->vector_elements, 1);
+        subtype = type->column_type();
       else
         subtype = type->fields.array;