On 08/06/2012 01:52 PM, Eric Anholt wrote:
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. --- src/mesa/main/condrender.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 57f3715..bfd2b08 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 "
Reviewed-by: Brian Paul <bri...@vmware.com> Candidate for the 8.0 branch? _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
