From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 29 Sep 2010 23:08:58 +0000 (+0200)
Subject: r300g: fix conditional rendering in non-wait path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83278d384ee123fa207229cc444f6e77e2d9a0d2;p=mesa.git

r300g: fix conditional rendering in non-wait path

NOTE: This is a candidate for the 7.9 branch.
---

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;
     }