From 2dabd4970477e956dd353be1a24e81aa1f0c5901 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 21 May 2016 19:43:42 -0400 Subject: [PATCH] mesa: allow xfb to be active in GLES when geometry shader is enabled. OES_geometry_shader has wording to allow xfb when using Draw*Indirect and DrawElements. Signed-off-by: Ilia Mirkin Reviewed-by: Anuj Phogat --- src/mesa/main/api_validate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index a714c0a2146..c7625c3f694 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -391,7 +391,8 @@ validate_DrawElements_common(struct gl_context *ctx, * DrawElementsInstanced, and DrawRangeElements while transform feedback * is active and not paused, regardless of mode. */ - if (_mesa_is_gles3(ctx) && _mesa_is_xfb_active_and_unpaused(ctx)) { + if (_mesa_is_gles3(ctx) && !ctx->Extensions.OES_geometry_shader && + _mesa_is_xfb_active_and_unpaused(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(transform feedback active)", caller); return false; @@ -741,7 +742,8 @@ valid_draw_indirect(struct gl_context *ctx, * "An INVALID_OPERATION error is generated if * transform feedback is active and not paused." */ - if (_mesa_is_gles31(ctx) && _mesa_is_xfb_active_and_unpaused(ctx)) { + if (_mesa_is_gles31(ctx) && !ctx->Extensions.OES_geometry_shader && + _mesa_is_xfb_active_and_unpaused(ctx)) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(TransformFeedback is active and not paused)", name); } -- 2.30.2