Mesa (mesa_7_4_branch): glsl: Expand nested preprocessor macros.
Brian Paul
brianp at kemper.freedesktop.org
Wed Jun 10 18:27:01 UTC 2009
Module: Mesa
Branch: mesa_7_4_branch
Commit: b7d9be69b25060b69c236ffba94da5e76a7228cd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7d9be69b25060b69c236ffba94da5e76a7228cd
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jun 10 12:24:52 2009 -0600
glsl: Expand nested preprocessor macros.
(cherry picked from master, commit ef8caec29ae73bb2bbeb48f0578d839ef29348cd)
---
src/mesa/shader/slang/slang_preprocess.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index eb10949..b2530a6 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -1018,6 +1018,8 @@ preprocess_source (slang_string *output, const char *source,
case TOKEN_DEFINE:
{
pp_symbol *symbol = NULL;
+ slang_string replacement;
+ expand_state es;
/* Parse macro name. */
id = (const char *) (&prod[i]);
@@ -1060,9 +1062,20 @@ preprocess_source (slang_string *output, const char *source,
idlen = _mesa_strlen (id);
if (state.cond.top->effective) {
pp_annotate (output, ") %s", id);
- slang_string_pushs (&symbol->replacement, id, idlen);
}
+ slang_string_init(&replacement);
+ slang_string_pushs(&replacement, id, idlen);
i += idlen + 1;
+
+ /* Expand macro replacement. */
+ es.output = &symbol->replacement;
+ es.input = slang_string_cstr(&replacement);
+ es.state = &state;
+ if (!expand(&es, &state.symbols)) {
+ slang_string_free(&replacement);
+ goto error;
+ }
+ slang_string_free(&replacement);
}
break;
More information about the mesa-commit
mailing list