diff options
| author | Paul Berry <stereotype441@gmail.com> | 2014-01-07 09:46:10 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2014-01-08 07:31:49 -0800 |
| commit | 911007820962d78a60c8056f64c0bde1ea724149 (patch) | |
| tree | b77acc4b703a9a9f2404295ef6efc116dfacdd55 /src/glsl/glsl_parser_extras.cpp | |
| parent | e3b86f07da4ba9a4db6b8aae4072af6f1638b7cc (diff) | |
| download | external_mesa3d-911007820962d78a60c8056f64c0bde1ea724149.zip external_mesa3d-911007820962d78a60c8056f64c0bde1ea724149.tar.gz external_mesa3d-911007820962d78a60c8056f64c0bde1ea724149.tar.bz2 | |
glsl: Change _mesa_glsl_parse_state ctor to use gl_shader_stage enum.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
v2: Also rename "target" param to "stage".
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/glsl/glsl_parser_extras.cpp')
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 0031e15..ce8279f 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -54,14 +54,12 @@ static unsigned known_desktop_glsl_versions[] = _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx, - GLenum target, void *mem_ctx) + gl_shader_stage stage, + void *mem_ctx) : ctx(_ctx), switch_state() { - switch (target) { - case GL_VERTEX_SHADER: this->stage = MESA_SHADER_VERTEX; break; - case GL_FRAGMENT_SHADER: this->stage = MESA_SHADER_FRAGMENT; break; - case GL_GEOMETRY_SHADER: this->stage = MESA_SHADER_GEOMETRY; break; - } + assert(stage < MESA_SHADER_STAGES); + this->stage = stage; this->scanner = NULL; this->translation_unit.make_empty(); @@ -1479,7 +1477,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader, bool dump_ast, bool dump_hir) { struct _mesa_glsl_parse_state *state = - new(shader) _mesa_glsl_parse_state(ctx, shader->Type, shader); + new(shader) _mesa_glsl_parse_state(ctx, shader->Stage, shader); const char *source = shader->Source; state->error = glcpp_preprocess(state, &source, &state->info_log, |