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

Author: Keith Whitwell <[email protected]>
Date:   Fri Jul  3 14:26:26 2009 +0100

mesa/shaders: fix gl_NormalMatrix state parameters

gl_NormalMatrix is the inverse transpose of the modelview matrix, but
as every matrix here needs to be transposed, we end up with
{MODELVIEW_MATRIX, INVERSE}.

---

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

diff --git a/src/mesa/shader/slang/slang_builtin.c 
b/src/mesa/shader/slang/slang_builtin.c
index 83e76b7..154609c 100644
--- a/src/mesa/shader/slang/slang_builtin.c
+++ b/src/mesa/shader/slang/slang_builtin.c
@@ -85,7 +85,7 @@ lookup_statevar(const char *var, GLint index1, GLint index2, 
const char *field,
       { "gl_TextureMatrixTranspose", STATE_TEXTURE_MATRIX, 0 },
       { "gl_TextureMatrixInverseTranspose", STATE_TEXTURE_MATRIX, 
STATE_MATRIX_INVERSE },
 
-      { "gl_NormalMatrix", STATE_MODELVIEW_MATRIX, STATE_MATRIX_TRANSPOSE },
+      { "gl_NormalMatrix", STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE },
 
       { NULL, 0, 0 }
    };

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to