Mesa (master): ARB prog parser: regenerated parser file

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Jan 6 13:52:34 UTC 2010


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan  5 10:56:57 2010 -0700

ARB prog parser: regenerated parser file

---

 src/mesa/shader/program_parse.tab.c |    7 +++++--
 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 cc490be..b12dcee 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




More information about the mesa-commit mailing list