fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Expand nested preprocessor macros.

Browse source
This commit is contained in:
Michal Krol 2009-06-09 12:14:40 +02:00
parent c534604800
commit ef8caec29a
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/shader/slang/slang_preprocess.c
View file

@ -1012,6 +1012,8 @@ preprocess_source (slang_string *output, const char *source,
case TOKEN_DEFINE: case TOKEN_DEFINE:
{ {
pp_symbol *symbol = NULL; pp_symbol *symbol = NULL;
slang_string replacement;
expand_state es;
/* Parse macro name. */ /* Parse macro name. */
id = (const char *) (&prod[i]); id = (const char *) (&prod[i]);
@ -1054,9 +1056,20 @@ preprocess_source (slang_string *output, const char *source,
idlen = _mesa_strlen (id); idlen = _mesa_strlen (id);
if (state.cond.top->effective) { if (state.cond.top->effective) {
pp_annotate (output, ") %s", id); 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; 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; break;