r300g: fix corruption when nr_cbufs==0 and multiwrites enabled

[mesa.git] / src / gallium / drivers / r300 / r300_query.c

diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 42cb6ade7634d31513339e48236aec9127ec81e4..6223e043210b92c94abee375f4b5c6974de582c9 100644 (file)
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -37,7 +37,9 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
     struct r300_screen *r300screen = r300->screen;
     struct r300_query *q;
 
-    assert(query_type == PIPE_QUERY_OCCLUSION_COUNTER);
+    if (query_type != PIPE_QUERY_OCCLUSION_COUNTER) {
+        return NULL;
+    }
 
     q = CALLOC_STRUCT(r300_query);
     if (!q)
@@ -55,7 +57,10 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
     insert_at_tail(&r300->query_list, q);
 
     /* Open up the occlusion query buffer. */
-    q->buffer = r300->rws->buffer_create(r300->rws, 4096, 0, q->domain, q->buffer_size);
+    q->buffer = r300->rws->buffer_create(r300->rws, q->buffer_size, 4096,
+                                         PIPE_BIND_CUSTOM, PIPE_USAGE_STREAM,
+                                         q->domain);
+    q->cs_buffer = r300->rws->buffer_get_cs_handle(r300->rws, q->buffer);
 
     return (struct pipe_query*)q;
 }
@@ -75,7 +80,7 @@ void r300_resume_query(struct r300_context *r300,
                        struct r300_query *query)
 {
     r300->query_current = query;
-    r300->query_start.dirty = TRUE;
+    r300_mark_atom_dirty(r300, &r300->query_start);
 }
 
 static void r300_begin_query(struct pipe_context* pipe,
@@ -132,7 +137,7 @@ static boolean r300_get_query_result(struct pipe_context* pipe,
 
     flags = PIPE_TRANSFER_READ | (!wait ? PIPE_TRANSFER_DONTBLOCK : 0);
 
-    map = r300->rws->buffer_map(r300->rws, q->buffer, flags);
+    map = r300->rws->buffer_map(r300->rws, q->buffer, r300->cs, flags);
     if (!map)
         return FALSE;
 
@@ -154,7 +159,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) {
@@ -163,19 +168,69 @@ 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;
     }
 }
 
+/***************************************************************************
+ * Fake occlusion queries (for debugging)
+ ***************************************************************************/
+
+static unsigned r300_fake_query;
+
+static struct pipe_query *r300_fake_create_query(struct pipe_context *pipe,
+                                                 unsigned query_type)
+{
+    return (struct pipe_query*)&r300_fake_query;
+}
+
+static void r300_fake_destroy_query(struct pipe_context* pipe,
+                                    struct pipe_query* query)
+{
+}
+
+static void r300_fake_begin_query(struct pipe_context* pipe,
+                                  struct pipe_query* query)
+{
+}
+
+static void r300_fake_end_query(struct pipe_context* pipe,
+                                struct pipe_query* query)
+{
+}
+
+static boolean r300_fake_get_query_result(struct pipe_context* pipe,
+                                          struct pipe_query* query,
+                                          boolean wait, void* vresult)
+{
+    uint64_t *result = (uint64_t*)vresult;
+    *result = 1000000;
+    return TRUE;
+}
+
+static void r300_fake_render_condition(struct pipe_context *pipe,
+                                       struct pipe_query *query, uint mode)
+{
+}
+
 void r300_init_query_functions(struct r300_context* r300) {
-    r300->context.create_query = r300_create_query;
-    r300->context.destroy_query = r300_destroy_query;
-    r300->context.begin_query = r300_begin_query;
-    r300->context.end_query = r300_end_query;
-    r300->context.get_query_result = r300_get_query_result;
-    r300->context.render_condition = r300_render_condition;
+    if (DBG_ON(r300, DBG_FAKE_OCC)) {
+        r300->context.create_query = r300_fake_create_query;
+        r300->context.destroy_query = r300_fake_destroy_query;
+        r300->context.begin_query = r300_fake_begin_query;
+        r300->context.end_query = r300_fake_end_query;
+        r300->context.get_query_result = r300_fake_get_query_result;
+        r300->context.render_condition = r300_fake_render_condition;
+    } else {
+        r300->context.create_query = r300_create_query;
+        r300->context.destroy_query = r300_destroy_query;
+        r300->context.begin_query = r300_begin_query;
+        r300->context.end_query = r300_end_query;
+        r300->context.get_query_result = r300_get_query_result;
+        r300->context.render_condition = r300_render_condition;
+    }
 }