diff options
| author | Michal Krol <michal@vmware.com> | 2009-06-26 12:48:14 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-07 10:11:54 +0200 |
| commit | 3dc2b5f71c2a519409becb6c1f177b5981fbacf7 (patch) | |
| tree | ee06da321dfb52c67bd258a755a595b2f5222189 /src/glsl/pp/sl_pp_process.c | |
| parent | a294715612d14d64e12026361ff7cc29321607d6 (diff) | |
glsl: Implement `undef' preprocessor directive.
Diffstat (limited to 'src/glsl/pp/sl_pp_process.c')
| -rw-r--r-- | src/glsl/pp/sl_pp_process.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c index 4715eed2fc..c17a3ac7ce 100644 --- a/src/glsl/pp/sl_pp_process.c +++ b/src/glsl/pp/sl_pp_process.c @@ -122,13 +122,7 @@ sl_pp_process(struct sl_pp_context *context, last = i - 1; - if (!strcmp(name, "define")) { - if (context->if_value) { - if (sl_pp_process_define(context, input, first, last)) { - return -1; - } - } - } else if (!strcmp(name, "if")) { + if (!strcmp(name, "if")) { if (sl_pp_process_if(context, input, first, last)) { return -1; } @@ -152,8 +146,18 @@ sl_pp_process(struct sl_pp_context *context, if (sl_pp_process_endif(context, input, first, last)) { return -1; } - } else { - /* XXX: Ignore. */ + } else if (context->if_value) { + if (!strcmp(name, "define")) { + if (sl_pp_process_define(context, input, first, last)) { + return -1; + } + } else if (!strcmp(name, "undef")) { + if (sl_pp_process_undef(context, input, first, last)) { + return -1; + } + } else { + /* XXX: Ignore. */ + } } } break; |