From 304ba4bba44057aa21f0ae434e49b1e09ab7d039 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 8 Jun 2009 13:53:33 -0600 Subject: glsl: Fix preprocessor define argument parsing for dead sections. (cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58) --- src/mesa/shader/slang/slang_preprocess.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c index ff913ad883..fd98fae360 100644 --- a/src/mesa/shader/slang/slang_preprocess.c +++ b/src/mesa/shader/slang/slang_preprocess.c @@ -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) -- cgit v1.2.3