commit 9f44247acf62b91669f77974a4bbad687d58859e
author Brian <brian@yutani.localnet.net> Fri Mar 09 11:34:18 2007 -0700
committer Brian <brian@yutani.localnet.net> Fri Mar 09 11:34:18 2007 -0700
tree 8b044bdec0ec29f5c15cce467908c92b3d944f7e
parent b03e1712b2d06159c13564ad8f70f79cf586510e

fix _mesa_uniform_matrix() transpose bug

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 924c9d5..271464e 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1005,7 +1005,7 @@
       for (col = 0; col < cols; col++) {
          GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
          for (row = 0; row < rows; row++) {
-            v[row] = values[col * rows + row];
+            v[row] = values[row * cols + col];
          }
       }
    }
@@ -1014,7 +1014,7 @@
       for (col = 0; col < cols; col++) {
          GLfloat *v = shProg->Uniforms->ParameterValues[location + col];
          for (row = 0; row < rows; row++) {
-            v[row] = values[row * cols + col];
+            v[row] = values[col * rows + row];
          }
       }
    }