diff options
| author | Jordan Justen <[email protected]> | 2013-03-09 14:09:30 -0800 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2013-05-23 09:37:11 -0700 |
| commit | 4369acff5e96782a64adc9c1fc81d63fb07f33f4 (patch) | |
| tree | 2fd0fa07b6475c2de673575fbc88ae89dec6e0f2 /src | |
| parent | d36cb3617c12808677f0963e1548e07e9347931c (diff) | |
glsl parser: on desktop GL require GLSL 150 for instance names
Interface blocks in GLSL 150 allow an instance name to be used.
v2:
* use state->check_version
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glsl/glsl_parser.yy | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy index dbc25a48405..70764d6dbf3 100644 --- a/src/glsl/glsl_parser.yy +++ b/src/glsl/glsl_parser.yy @@ -1953,11 +1953,9 @@ basic_interface_block: * the same language versions, we don't have to explicitly * version-check both things. */ - if (block->instance_name != NULL - && !(state->language_version == 300 && state->es_shader)) { - _mesa_glsl_error(& @1, state, - "#version 300 es required for using uniform " - "blocks with an instance name\n"); + if (block->instance_name != NULL) { + state->check_version(150, 300, & @1, "interface blocks with " + "an instance name are not allowed"); } block->layout.flags.i |= $1.flags.i; |