Fix matrix dimensioning

Newb GL mistake: matrices in GL are column-major. This means that vector_elements is the number of rows. Making these changes causes matrix-08.glsl to pass.
2010-03-25 13:19:13 -07:00
parent c1bd3a1a61
commit 1b4f04124a
4 changed files with 11 additions and 11 deletions
--- a/ir_function.cpp
+++ b/ir_function.cpp
@@ -38,7 +38,7 @@ type_compare(const glsl_type *a, const glsl_type *b)
   case GLSL_TYPE_FLOAT:
   case GLSL_TYPE_BOOL:
      if ((a->vector_elements != b->vector_elements)
-	  || (a->matrix_rows != b->matrix_rows))
+	  || (a->matrix_columns != b->matrix_columns))
 	 return -1;

      /* There is no implicit conversion to or from bool.