From 7371224c069357319b3f2ee9e9b017fc284897cb Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 8 Sep 2011 16:52:44 -0700 Subject: [PATCH] mesa: Throw an error instead of asserting for condrender with query == 0. From the NV_conditional_render spec: BeginQuery sets the active query object name for the query type given by to . If BeginQuery is called with an of zero, if the active query object name for is non-zero, if is the active query object name for any query type, or if is the active query object for condtional rendering (Section 2.X), the error INVALID OPERATION is generated. Fixes piglit nv_conditional_render-begin-zero. Reviewed-by: Brian Paul --- src/mesa/main/condrender.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 352e2e2b165..c8195a520cf 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -44,7 +44,8 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode) struct gl_query_object *q; GET_CURRENT_CONTEXT(ctx); - if (!ctx->Extensions.NV_conditional_render || ctx->Query.CondRenderQuery) { + if (!ctx->Extensions.NV_conditional_render || ctx->Query.CondRenderQuery || + queryId == 0) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginConditionalRender()"); return; } -- 2.30.2