mesa: Branch 'glsl-compiler-1'

[Brian Paul]

 src/mesa/shader/shader_api.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 9f44247acf62b91669f77974a4bbad687d58859e (from b03e1712b2d06159c13564ad8f70f79cf586510e)
Author: Brian <brian at yutani.localnet.net>
Date:   Fri Mar 9 11:34:18 2007 -0700

    fix _mesa_uniform_matrix() transpose bug

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 @@ _mesa_uniform_matrix(GLcontext *ctx, GLi
       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 @@ _mesa_uniform_matrix(GLcontext *ctx, GLi
       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];
          }
       }
    }