summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-09-20 10:56:10 -0600
committerBrian Paul <[email protected]>2010-09-20 10:56:10 -0600
commita9fceb69792acb2e6e6fad8c2a8ba27d0b04470f (patch)
tree6b17f603c0efabc59c43ebb1885357e64456d668
parentfebd353bcd198a38d5f5fe7d31162c42bc87b93e (diff)
llvmpipe: fix query bug when no there's no scene
(cherry picked from commit 7888a2f82200738ac03c78d9900eb028d48725a1)
-rw-r--r--src/gallium/drivers/llvmpipe/lp_query.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_query.c b/src/gallium/drivers/llvmpipe/lp_query.c
index ff0e207a54b..84c66dd36e8 100644
--- a/src/gallium/drivers/llvmpipe/lp_query.c
+++ b/src/gallium/drivers/llvmpipe/lp_query.c
@@ -92,8 +92,9 @@ llvmpipe_get_query_result(struct pipe_context *pipe,
int i;
if (!pq->fence) {
- assert(0); /* query not in issued state */
- return FALSE;
+ /* no fence because there was no scene, so results is zero */
+ *result = 0;
+ return TRUE;
}
if (!lp_fence_signalled(pq->fence)) {