Mesa (mesa_7_4_branch): glsl: Fix preprocessor define argument parsing for dead sections.

[Brian Paul]

Module: Mesa
Branch: mesa_7_4_branch
Commit: 7b8b856c977e31b24ccfd51a45cf788459aa5c94
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b8b856c977e31b24ccfd51a45cf788459aa5c94

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Jun 10 12:24:32 2009 -0600

glsl: Fix preprocessor define argument parsing for dead sections.

(cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58)

---

 src/mesa/shader/slang/slang_preprocess.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index 60b2d82..eb10949 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -1041,11 +1041,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)