diff options
| author | Eric Anholt <[email protected]> | 2012-08-06 08:26:30 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-10-24 11:41:06 -0700 |
| commit | 7a139205975569630586c73522c7e934d0cae937 (patch) | |
| tree | d02f0ee78a0ca7552ee1d3807185fbf8c85e9df5 | |
| parent | bd9f729091bbbce521d4526afd0230da2a7cf350 (diff) | |
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 <[email protected]>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 1b148e660e4cefcfbdc65ef8a58a7e52e8820782)
| -rw-r--r-- | src/mesa/main/condrender.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 " |