From 1b148e660e4cefcfbdc65ef8a58a7e52e8820782 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 6 Aug 2012 08:26:30 -0700 Subject: mesa: In conditional rendering fallback, check the query status. Otherwise, conditional rendering always takes the fallthrough "render it anyway" case unless the application had itself done a check or wait on the query. Fixes intel oglconform's conditional_render advanced.nofbo.readpixels. Reviewed-by: Brian Paul NOTE: This is a candidate for the 8.0 branch. --- src/mesa/main/condrender.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/mesa/main') diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 57f3715211d..bfd2b081807 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -139,6 +139,8 @@ _mesa_check_conditional_render(struct gl_context *ctx) case GL_QUERY_BY_REGION_NO_WAIT: /* fall-through */ case GL_QUERY_NO_WAIT: + if (!q->Ready) + ctx->Driver.CheckQuery(ctx, q); return q->Ready ? (q->Result > 0) : GL_TRUE; default: _mesa_problem(ctx, "Bad cond render mode %s in " -- cgit v1.2.3