aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-09-07 16:25:22 -0700
committerEric Anholt <[email protected]>2010-09-07 16:43:35 -0700
commit4a867be14378587574b3082071e9fff962d28d12 (patch)
treef94b86ebd96731cd958d1deb150ca9a846e1ea63 /src/mesa/program
parenta09a8ec12d76e1fb1583fa99cf9f48246c108d7b (diff)
ir_to_mesa: Add support for gl_NormalScale.
Bug #30040.
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/ir_to_mesa.cpp5
-rw-r--r--src/mesa/program/prog_statevars.c2
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 4f6535fa479..960d5c7cece 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 ead3ece95d4..2687f8ae2c0 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)