diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2016-05-23 14:37:01 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2016-08-26 15:03:14 -0700 |
| commit | 06201e4f1afb5c4354d5e2238a57e54c9463cf9f (patch) | |
| tree | b33d89100a0b2e811505b607af926364200e2aab /src/compiler/glsl/glsl_parser.yy | |
| parent | 3a0ae7b55c4c38b9d0a37aa2a741da18c33f49fe (diff) | |
| download | external_mesa3d-06201e4f1afb5c4354d5e2238a57e54c9463cf9f.zip external_mesa3d-06201e4f1afb5c4354d5e2238a57e54c9463cf9f.tar.gz external_mesa3d-06201e4f1afb5c4354d5e2238a57e54c9463cf9f.tar.bz2 | |
glsl: Allow invocations layout qualifier with GL_OES_geometry_shader
Fixes
dEQP-GLES31.functional.geometry_shading.instanced.geometry_1_invocations
dEQP-GLES31.functional.geometry_shading.instanced.invocation_per_layer_2d_array
dEQP-GLES31.functional.geometry_shading.instanced.invocation_per_layer_2d_multisample_array
dEQP-GLES31.functional.geometry_shading.instanced.invocation_per_layer_3d
dEQP-GLES31.functional.geometry_shading.instanced.invocation_per_layer_cubemap
dEQP-GLES31.functional.geometry_shading.instanced.multiple_layers_per_invocation_2d_array
dEQP-GLES31.functional.geometry_shading.instanced.multiple_layers_per_invocation_2d_multisample_array
dEQP-GLES31.functional.geometry_shading.instanced.multiple_layers_per_invocation_3d
dEQP-GLES31.functional.geometry_shading.instanced.multiple_layers_per_invocation_cubemap
dEQP-GLES31.functional.geometry_shading.query.geometry_shader_invocations
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/compiler/glsl/glsl_parser.yy')
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index 4043dae..3f35b2f 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -1632,8 +1632,10 @@ layout_qualifier_id: if (match_layout_qualifier("invocations", $1, state) == 0) { $$.flags.q.invocations = 1; $$.invocations = new(ctx) ast_layout_expression(@1, $3); - if (!state->is_version(400, 0) && - !state->ARB_gpu_shader5_enable) { + if (!state->is_version(400, 320) && + !state->ARB_gpu_shader5_enable && + !state->OES_geometry_shader_enable && + !state->EXT_geometry_shader_enable) { _mesa_glsl_error(& @3, state, "GL_ARB_gpu_shader5 invocations " "qualifier specified", $3); |