Mesa (glsl2): glsl2: Preprocessed source doesn' t need to live past compile time.

Ian Romanick idr at kemper.freedesktop.org
Wed Jun 30 13:56:40 PDT 2010


Module: Mesa
Branch: glsl2
Commit: 629198b96a8f471c48932d6af56184b6c33b5fe5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=629198b96a8f471c48932d6af56184b6c33b5fe5

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jun 29 11:31:04 2010 -0700

glsl2: Preprocessed source doesn't need to live past compile time.

---

 src/glsl/main.cpp              |    5 +----
 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 8b2eeaa..fa63853 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 c3de3aa..4eac810 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);



More information about the mesa-commit mailing list