Mesa (master): ir_to_mesa: Add support for gl_NormalScale.

Eric Anholt anholt at kemper.freedesktop.org
Tue Sep 7 23:44:32 UTC 2010


Module: Mesa
Branch: master
Commit: 4a867be14378587574b3082071e9fff962d28d12
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a867be14378587574b3082071e9fff962d28d12

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Sep  7 16:25:22 2010 -0700

ir_to_mesa: Add support for gl_NormalScale.

Bug #30040.

---

 src/mesa/program/ir_to_mesa.cpp   |    5 +++++
 src/mesa/program/prog_statevars.c |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 4f6535f..960d5c7 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -703,6 +703,10 @@ static struct statevar_element gl_Fog_elements[] = {
    {"scale", {STATE_FOG_PARAMS}, SWIZZLE_WWWW},
 };
 
+static struct statevar_element gl_NormalScale_elements[] = {
+   {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},
+};
+
 #define MATRIX(name, statevar, modifier)			\
    static struct statevar_element name ## _elements[] = {		\
       { NULL, { statevar, 0, 0, 0, modifier}, SWIZZLE_XYZW },		\
@@ -808,6 +812,7 @@ static const struct statevar {
    STATEVAR(gl_TextureMatrixInverseTranspose),
 
    STATEVAR(gl_NormalMatrix),
+   STATEVAR(gl_NormalScale),
 };
 
 void
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c
index ead3ece..2687f8a 100644
--- a/src/mesa/program/prog_statevars.c
+++ b/src/mesa/program/prog_statevars.c
@@ -1052,6 +1052,8 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
       append_token(str, state[1]);
       append_index(str, state[2]);
       break;
+   case STATE_NORMAL_SCALE:
+      break;
    case STATE_INTERNAL:
       append_token(str, state[1]);
       if (state[1] == STATE_CURRENT_ATTRIB)




More information about the mesa-commit mailing list