Mesa (master): glsl: Use the column_types() helper method.

Eric Anholt anholt at kemper.freedesktop.org
Thu Apr 19 23:40:03 UTC 2012


Module: Mesa
Branch: master
Commit: c07290ddb2bf3095b9f5a1e0b33697999834fa0e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c07290ddb2bf3095b9f5a1e0b33697999834fa0e

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 16 09:15:36 2012 -0700

glsl: Use the column_types() helper method.

Ken noted this in a review of this patch that I pushed early.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/glsl/opt_array_splitting.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/glsl/opt_array_splitting.cpp b/src/glsl/opt_array_splitting.cpp
index 5cf448b..b9c70dc 100644
--- a/src/glsl/opt_array_splitting.cpp
+++ b/src/glsl/opt_array_splitting.cpp
@@ -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;
 




More information about the mesa-commit mailing list