diff options
author | Marek Olšák <[email protected]> | 2010-09-30 01:08:58 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2010-09-30 02:44:30 +0200 |
commit | 83278d384ee123fa207229cc444f6e77e2d9a0d2 (patch) | |
tree | 76af993aee6ac1c5189d953fcf538c41a3f9a140 /src/gallium | |
parent | ad1506c5ac61b75e45f24a2e18c91dc8a49a3bb0 (diff) |
r300g: fix conditional rendering in non-wait path
NOTE: This is a candidate for the 7.9 branch.
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/r300/r300_query.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index 5b0121ce9e1..5f34fcb2744 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -158,7 +158,7 @@ static void r300_render_condition(struct pipe_context *pipe, uint mode) { struct r300_context *r300 = r300_context(pipe); - uint64_t result; + uint64_t result = 0; boolean wait; if (query) { @@ -167,9 +167,9 @@ static void r300_render_condition(struct pipe_context *pipe, if (!r300_get_query_result(pipe, query, wait, &result)) { r300->skip_rendering = FALSE; + } else { + r300->skip_rendering = result == 0; } - - r300->skip_rendering = result == 0; } else { r300->skip_rendering = FALSE; } |