summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-01-05 10:56:57 -0700
committerBrian Paul <brianp@vmware.com>2010-01-05 11:44:19 -0700
commit487a14b476d5e01bd03f50bc45fd3dfc59aa609c (patch)
tree3d1bbd28c09fd77cdd656e77c892df514d23586f
parentf0f68b1e4c3d3d23fc9a7d624a465537b2e74d6c (diff)
ARB prog parser: regenerated parser file
-rw-r--r--src/mesa/shader/program_parse.tab.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index cc490bea6d..b12dcee9df 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -5477,9 +5477,12 @@ initialize_symbol_from_param(struct gl_program *prog,
assert((state_tokens[1] == STATE_ENV)
|| (state_tokens[1] == STATE_LOCAL));
+ /*
+ * The param type is STATE_VAR. The program parameter entry will
+ * effectively be a pointer into the LOCAL or ENV parameter array.
+ */
param_var->type = at_param;
- param_var->param_binding_type = (state_tokens[1] == STATE_ENV)
- ? PROGRAM_ENV_PARAM : PROGRAM_LOCAL_PARAM;
+ param_var->param_binding_type = PROGRAM_STATE_VAR;
/* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,
* we need to unroll it and call add_state_reference() for each row