glsl: Fix preprocessor define argument parsing for dead sections.
authorBrian Paul <brianp@vmware.com>
Mon, 8 Jun 2009 19:53:33 +0000 (13:53 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 8 Jun 2009 19:53:33 +0000 (13:53 -0600)
(cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58)

src/mesa/shader/slang/slang_preprocess.c

index ff913ad8838ddaa756eb4cb31bf360c8b143184c..fd98fae360baf36789fdd52b27696ec0f053bd6a 100644 (file)
@@ -1035,11 +1035,11 @@ preprocess_source (slang_string *output, const char *source,
 
                /* Parse optional macro parameters. */
                while (prod[i++] != PARAM_END) {
-                  if (state.cond.top->effective) {
-                     pp_symbol *param;
+                  pp_symbol *param;
 
-                     id = (const char *) (&prod[i]);
-                     idlen = _mesa_strlen (id);
+                  id = (const char *) (&prod[i]);
+                  idlen = _mesa_strlen (id);
+                  if (state.cond.top->effective) {
                      pp_annotate (output, "%s, ", id);
                      param = pp_symbols_push (&symbol->parameters);
                      if (param == NULL)