diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2010-06-29 11:31:04 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-06-30 13:52:24 -0700 |
| commit | 629198b96a8f471c48932d6af56184b6c33b5fe5 (patch) | |
| tree | 324945d98f6abe924779cdde4aab5b0f1a893cc3 | |
| parent | c6099a65f8f8310a540f7c19cfc380ad980c9dd7 (diff) | |
glsl2: Preprocessed source doesn't need to live past compile time.
| -rw-r--r-- | src/glsl/main.cpp | 5 | ||||
| -rw-r--r-- | src/mesa/shader/ir_to_mesa.cpp | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 8b2eeaa13a..fa63853b47 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -129,11 +129,8 @@ compile_shader(struct gl_shader *shader) state->Const.MaxDrawBuffers = 2; - /* 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); + state->error = preprocess(state, &source, &state->info_log); if (!state->error) { _mesa_glsl_lexer_ctor(state, source); diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp index c3de3aae05..4eac810679 100644 --- a/src/mesa/shader/ir_to_mesa.cpp +++ b/src/mesa/shader/ir_to_mesa.cpp @@ -1679,11 +1679,8 @@ _mesa_glsl_compile_shader(GLcontext *ctx, struct gl_shader *shader) state->Const.MaxDrawBuffers = ctx->Const.MaxDrawBuffers; - /* 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); + state->error = preprocess(state, &source, &state->info_log); if (!state->error) { _mesa_glsl_lexer_ctor(state, source); |