summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-06-10 12:24:32 -0600
committerBrian Paul <brianp@vmware.com>2009-06-17 11:30:03 -0600
commited31da85cac1bc7d42e8efbd00e130ad323aaf35 (patch)
treee927470897854c503b8e1bc794b081776582a21a /src
parent9ead7677b3a5146b9e1de9f60fd71475ffbebc50 (diff)
glsl: Fix preprocessor define argument parsing for dead sections.
(cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/shader/slang/slang_preprocess.c8
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 60b2d82606a..eb109499312 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)