Mesa (glsl2): glsl2: Invoke preprocessor before calling the compiler proper
Ian Romanick
idr at kemper.freedesktop.org
Tue Jun 29 18:15:11 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 153eca98064252be4daad9cc27746f37c245b627
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=153eca98064252be4daad9cc27746f37c245b627
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Jun 29 10:02:36 2010 -0700
glsl2: Invoke preprocessor before calling the compiler proper
---
src/mesa/shader/ir_to_mesa.cpp | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index 24b03e1..1232bad 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -1526,9 +1526,17 @@ _mesa_get_glsl_shader(GLcontext *ctx, void *mem_ctx, struct gl_shader *sh)
state->loop_or_switch_nesting = NULL;
state->ARB_texture_rectangle_enable = true;
- _mesa_glsl_lexer_ctor(state, shader->Source);
- _mesa_glsl_parse(state);
- _mesa_glsl_lexer_dtor(state);
+ /* Create a new context for the preprocessor output. Ultimately, this
+ * should probably be the parser context, but there isn't one yet.
+ */
+ const char *source = shader->Source;
+ state->error = preprocess(shader, &source, &state->info_log);
+
+ if (!state->error) {
+ _mesa_glsl_lexer_ctor(state, source);
+ _mesa_glsl_parse(state);
+ _mesa_glsl_lexer_dtor(state);
+ }
shader->ir.make_empty();
if (!state->error && !state->translation_unit.is_empty())
More information about the mesa-commit
mailing list