diff options
author | Paul Berry <[email protected]> | 2013-12-16 13:09:20 -0800 |
---|---|---|
committer | Paul Berry <[email protected]> | 2013-12-17 12:31:36 -0800 |
commit | 7963fde37b6646aef7868f9d552960e5967dd811 (patch) | |
tree | 071cdf5d1a6349ed4b9cb62b54ca71d7fb3f8e82 /src/glsl/glsl_parser.yy | |
parent | abab4385437bdcfbfff1cf772a5c418eb06ed822 (diff) |
glsl: Replace _mesa_glsl_parser_targets enum with gl_shader_type.
These enums were redundant.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser.yy')
-rw-r--r-- | src/glsl/glsl_parser.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index 10165547924..39767609d20 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -2219,11 +2219,11 @@ basic_interface_block: * "It is illegal to have an input block in a vertex shader * or an output block in a fragment shader" */ - if ((state->target == vertex_shader) && $1.flags.q.in) { + if ((state->target == MESA_SHADER_VERTEX) && $1.flags.q.in) { _mesa_glsl_error(& @1, state, "`in' interface block is not allowed for " "a vertex shader"); - } else if ((state->target == fragment_shader) && $1.flags.q.out) { + } else if ((state->target == MESA_SHADER_FRAGMENT) && $1.flags.q.out) { _mesa_glsl_error(& @1, state, "`out' interface block is not allowed for " "a fragment shader"); @@ -2377,7 +2377,7 @@ layout_defaults: { void *ctx = state; $$ = NULL; - if (state->target != geometry_shader) { + if (state->target != MESA_SHADER_GEOMETRY) { _mesa_glsl_error(& @1, state, "input layout qualifiers only valid in " "geometry shaders"); @@ -2405,7 +2405,7 @@ layout_defaults: | layout_qualifier OUT_TOK ';' { - if (state->target != geometry_shader) { + if (state->target != MESA_SHADER_GEOMETRY) { _mesa_glsl_error(& @1, state, "out layout qualifiers only valid in " "geometry shaders"); |