From 7a73c6acb0a4f5f049795f73a54a08a6dbe166ed Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Thu, 12 Dec 2013 14:34:27 -0800 Subject: [PATCH] mesa: Fix error code generation in glBeginConditionalRender() This patch changes the error condition to satisfy below statement from OpenGL 4.3 core specification: "An INVALID_OPERATION error is generated if id is the name of a query object with a target other SAMPLES_PASSED, ANY_SAMPLES_PASSED, or ANY_SAMPLES_PASSED_CONSERVATIVE, or if id is the name of a query currently in progress." Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Anuj Phogat Reviewed-by: Brian Paul --- src/mesa/main/condrender.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 3d9b0eca1ab..2632f7a1a37 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -72,7 +72,9 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode) } ASSERT(q->Id == queryId); - if (q->Target != GL_SAMPLES_PASSED || q->Active) { + if ((q->Target != GL_SAMPLES_PASSED && + q->Target != GL_ANY_SAMPLES_PASSED && + q->Target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE) || q->Active) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()"); return; } -- 2.30.2