summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2014-01-07 09:46:10 -0800
committerPaul Berry <stereotype441@gmail.com>2014-01-08 07:31:49 -0800
commit911007820962d78a60c8056f64c0bde1ea724149 (patch)
treeb77acc4b703a9a9f2404295ef6efc116dfacdd55 /src/glsl
parente3b86f07da4ba9a4db6b8aae4072af6f1638b7cc (diff)
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')
-rw-r--r--src/glsl/glsl_parser_extras.cpp12
-rw-r--r--src/glsl/glsl_parser_extras.h2
-rw-r--r--src/glsl/main.cpp2
-rw-r--r--src/glsl/test_optpass.cpp2
-rw-r--r--src/glsl/tests/builtin_variable_test.cpp2
5 files changed, 9 insertions, 11 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 0031e15d722..ce8279f7b54 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,
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 197f337529e..6572488e033 100644
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -68,7 +68,7 @@ extern void _mesa_glsl_error(YYLTYPE *locp, _mesa_glsl_parse_state *state,
struct _mesa_glsl_parse_state {
- _mesa_glsl_parse_state(struct gl_context *_ctx, GLenum target,
+ _mesa_glsl_parse_state(struct gl_context *_ctx, gl_shader_stage stage,
void *mem_ctx);
DECLARE_RALLOC_CXX_OPERATORS(_mesa_glsl_parse_state);
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index 3260c44710f..736689eb75c 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -276,7 +276,7 @@ void
compile_shader(struct gl_context *ctx, struct gl_shader *shader)
{
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);
_mesa_glsl_compile_shader(ctx, shader, dump_ast, dump_hir);
diff --git a/src/glsl/test_optpass.cpp b/src/glsl/test_optpass.cpp
index bdb1e8ffdeb..1a15f3c63ae 100644
--- a/src/glsl/test_optpass.cpp
+++ b/src/glsl/test_optpass.cpp
@@ -209,7 +209,7 @@ int test_optpass(int argc, char **argv)
string input = read_stdin_to_eof();
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);
if (input_format_ir) {
shader->ir = new(shader) exec_list;
diff --git a/src/glsl/tests/builtin_variable_test.cpp b/src/glsl/tests/builtin_variable_test.cpp
index 9b4a097b1e4..3fdfce57d4f 100644
--- a/src/glsl/tests/builtin_variable_test.cpp
+++ b/src/glsl/tests/builtin_variable_test.cpp
@@ -68,7 +68,7 @@ common_builtin::SetUp()
this->shader->Stage = _mesa_shader_enum_to_shader_stage(this->shader_type);
this->state =
- new(mem_ctx) _mesa_glsl_parse_state(&this->ctx, this->shader->Type,
+ new(mem_ctx) _mesa_glsl_parse_state(&this->ctx, this->shader->Stage,
this->shader);
_mesa_glsl_initialize_types(this->state);