diff options
| author | Dylan Noblesmith <[email protected]> | 2012-04-02 16:14:31 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <[email protected]> | 2012-05-02 16:12:22 +0000 |
| commit | 8c99906cf5c8825ada0699f61926864e568ca69a (patch) | |
| tree | 552c164a2acd0bf5e6286550969399999ea9027e | |
| parent | 58fee81c78c95b1b086aa39aa4e26762c8943680 (diff) | |
glsl: add gl_context member
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 5b13fc1a45e..4f26205b616 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -36,8 +36,9 @@ extern "C" { #include "ir_optimization.h" #include "loop_analysis.h" -_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *ctx, +_mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx) + : ctx(_ctx) { switch (target) { case GL_VERTEX_SHADER: this->target = vertex_shader; break; diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 55676f5a9ec..1a909c68b7f 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -57,7 +57,7 @@ struct glsl_switch_state { }; struct _mesa_glsl_parse_state { - _mesa_glsl_parse_state(struct gl_context *ctx, GLenum target, + _mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target, void *mem_ctx); /* Callers of this ralloc-based new need not call delete. It's @@ -77,6 +77,7 @@ struct _mesa_glsl_parse_state { ralloc_free(mem); } + struct gl_context *const ctx; void *scanner; exec_list translation_unit; glsl_symbol_table *symbols; |