From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 17 Aug 2010 22:57:48 +0000 (-0700)
Subject: glsl2: Fix transpose of rows and cols
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdc0e5285a3d7d29b953970e43ca548cbc4e7e30;p=mesa.git

glsl2: Fix transpose of rows and cols

This error led to an assertion failure for some constructors of
non-square matrices.  It only occured in matrices where the number of
columns was greater than the number of rows.  It didn't even always
occur on those.

Fixes piglit glslparsertest case constructor-16.vert.
---

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 6c36a04889e..f85b308c1bf 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -904,8 +904,8 @@ emit_inline_matrix_constructor(const glsl_type *type,
 	 instructions->push_tail(inst);
       }
    } else {
-      const unsigned rows = type->matrix_columns;
-      const unsigned cols = type->vector_elements;
+      const unsigned cols = type->matrix_columns;
+      const unsigned rows = type->vector_elements;
       unsigned col_idx = 0;
       unsigned row_idx = 0;