X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_query.c;h=d2dc7b73c05b96271bbddc006f610957dd894044;hb=5bcfe905019b6865439ec9e32ce28a2df9ca8659;hp=97081c4a00f3fc24ac09cb6f4bda58869e76d844;hpb=992382762a74fd834926fd2c3cd9e14a186e2dd5;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 97081c4a00f..d2dc7b73c05 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "util/u_memory.h"
-#include "util/u_simple_list.h"
+#include "util/simple_list.h"
 
 #include "r300_context.h"
 #include "r300_screen.h"
@@ -30,172 +30,192 @@
 #include <stdio.h>
 
 static struct pipe_query *r300_create_query(struct pipe_context *pipe,
-                                            unsigned query_type)
+                                            unsigned query_type,
+                                            unsigned index)
 {
     struct r300_context *r300 = r300_context(pipe);
     struct r300_screen *r300screen = r300->screen;
-    unsigned query_size;
-    struct r300_query *q, *qptr;
+    struct r300_query *q;
+
+    if (query_type != PIPE_QUERY_OCCLUSION_COUNTER &&
+        query_type != PIPE_QUERY_OCCLUSION_PREDICATE &&
+        query_type != PIPE_QUERY_GPU_FINISHED) {
+        return NULL;
+    }
 
     q = CALLOC_STRUCT(r300_query);
+    if (!q)
+        return NULL;
 
     q->type = query_type;
-    assert(q->type == PIPE_QUERY_OCCLUSION_COUNTER);
 
-    if (r300screen->caps.family == CHIP_FAMILY_RV530)
-        query_size = r300screen->caps.num_z_pipes * sizeof(uint32_t);
-    else
-        query_size = r300screen->caps.num_frag_pipes * sizeof(uint32_t);
-
-    if (!is_empty_list(&r300->query_list)) {
-        qptr = last_elem(&r300->query_list);
-        q->offset = qptr->offset + query_size;
+    if (query_type == PIPE_QUERY_GPU_FINISHED) {
+        return (struct pipe_query*)q;
     }
-    insert_at_tail(&r300->query_list, q);
 
-    /* XXX */
-    if (q->offset >= 4096) {
-        q->offset = 0;
-        fprintf(stderr, "r300: Rewinding OQBO...\n");
+    if (r300screen->caps.family == CHIP_RV530)
+        q->num_pipes = r300screen->info.r300_num_z_pipes;
+    else
+        q->num_pipes = r300screen->info.r300_num_gb_pipes;
+
+    q->buf = r300->rws->buffer_create(r300->rws,
+                                      r300screen->info.gart_page_size,
+                                      r300screen->info.gart_page_size,
+                                      RADEON_DOMAIN_GTT, 0);
+    if (!q->buf) {
+        FREE(q);
+        return NULL;
     }
-
     return (struct pipe_query*)q;
 }
 
 static void r300_destroy_query(struct pipe_context* pipe,
                                struct pipe_query* query)
 {
-    struct r300_query* q = (struct r300_query*)query;
+    struct r300_query* q = r300_query(query);
 
-    remove_from_list(q);
+    pb_reference(&q->buf, NULL);
     FREE(query);
 }
 
-static void r300_begin_query(struct pipe_context* pipe,
-                             struct pipe_query* query)
+void r300_resume_query(struct r300_context *r300,
+                       struct r300_query *query)
+{
+    r300->query_current = query;
+    r300_mark_atom_dirty(r300, &r300->query_start);
+}
+
+static boolean r300_begin_query(struct pipe_context* pipe,
+                                struct pipe_query* query)
 {
-    uint32_t value = ~0U;
     struct r300_context* r300 = r300_context(pipe);
-    struct r300_query* q = (struct r300_query*)query;
+    struct r300_query* q = r300_query(query);
+
+    if (q->type == PIPE_QUERY_GPU_FINISHED)
+        return true;
 
     if (r300->query_current != NULL) {
         fprintf(stderr, "r300: begin_query: "
                 "Some other query has already been started.\n");
         assert(0);
-        return;
+        return false;
     }
 
-    pipe_buffer_write(pipe,
-		      r300->oqbo,
-		      q->offset,
-		      sizeof value,
-		      &value);
+    q->num_results = 0;
+    r300_resume_query(r300, q);
+    return true;
+}
 
-    q->flushed = FALSE;
-    r300->query_current = q;
-    r300->query_start.dirty = TRUE;
+void r300_stop_query(struct r300_context *r300)
+{
+    r300_emit_query_end(r300);
+    r300->query_current = NULL;
 }
 
-static void r300_end_query(struct pipe_context* pipe,
+static bool r300_end_query(struct pipe_context* pipe,
 	                   struct pipe_query* query)
 {
     struct r300_context* r300 = r300_context(pipe);
+    struct r300_query *q = r300_query(query);
 
-    if ((struct r300_query*)query != r300->query_current) {
+    if (q->type == PIPE_QUERY_GPU_FINISHED) {
+        pb_reference(&q->buf, NULL);
+        r300_flush(pipe, RADEON_FLUSH_ASYNC,
+                   (struct pipe_fence_handle**)&q->buf);
+        return true;
+    }
+
+    if (q != r300->query_current) {
         fprintf(stderr, "r300: end_query: Got invalid query.\n");
         assert(0);
-        return;
+        return false;
     }
 
-    r300_emit_query_end(r300);
-    r300->query_current = NULL;
+    r300_stop_query(r300);
+
+    return true;
 }
 
 static boolean r300_get_query_result(struct pipe_context* pipe,
                                      struct pipe_query* query,
                                      boolean wait,
-                                     uint64_t* result)
+                                     union pipe_query_result *vresult)
 {
     struct r300_context* r300 = r300_context(pipe);
-    struct r300_screen* r300screen = r300->screen;
-    struct r300_query *q = (struct r300_query*)query;
-    struct pipe_transfer *transfer;
-    unsigned flags = PIPE_TRANSFER_READ;
-    uint32_t* map;
-    uint32_t temp = 0;
-    unsigned i, num_results;
-
-    if (q->flushed == FALSE)
-        pipe->flush(pipe, 0, NULL);
-    if (!wait) {
-        flags |= PIPE_TRANSFER_DONTBLOCK;
+    struct r300_query *q = r300_query(query);
+    unsigned i;
+    uint32_t temp, *map;
+
+    if (q->type == PIPE_QUERY_GPU_FINISHED) {
+        if (wait) {
+            r300->rws->buffer_wait(q->buf, PIPE_TIMEOUT_INFINITE,
+                                   RADEON_USAGE_READWRITE);
+            vresult->b = TRUE;
+        } else {
+            vresult->b = r300->rws->buffer_wait(q->buf, 0, RADEON_USAGE_READWRITE);
+        }
+        return vresult->b;
     }
 
-    map = pipe_buffer_map(pipe, r300->oqbo, flags, &transfer);
+    map = r300->rws->buffer_map(q->buf, r300->cs,
+                                PIPE_TRANSFER_READ |
+                                (!wait ? PIPE_TRANSFER_DONTBLOCK : 0));
     if (!map)
         return FALSE;
-    map += q->offset / 4;
 
-    if (r300screen->caps.family == CHIP_FAMILY_RV530)
-        num_results = r300screen->caps.num_z_pipes;
-    else
-        num_results = r300screen->caps.num_frag_pipes;
-
-    for (i = 0; i < num_results; i++) {
-        if (*map == ~0U) {
-            /* Looks like our results aren't ready yet. */
-            if (wait) {
-                fprintf(stderr, "r300: Despite waiting, OQ results haven't "
-                                "come in yet. This is a driver bug.\n"
-                                "r300: Returning bogus results to avoid "
-                                "a possible infinite loop...\n");
-                temp = 987654321;
-            } else {
-                temp = ~0U;
-            }
-            break;
-        }
-        temp += *map;
+    /* Sum up the results. */
+    temp = 0;
+    for (i = 0; i < q->num_results; i++) {
+        /* Convert little endian values written by GPU to CPU byte order */
+        temp += util_le32_to_cpu(*map);
         map++;
     }
-    pipe_buffer_unmap(pipe, r300->oqbo, transfer);
 
-    if (temp == ~0U) {
-        /* Our results haven't been written yet... */
-        return FALSE;
+    if (q->type == PIPE_QUERY_OCCLUSION_PREDICATE) {
+        vresult->b = temp != 0;
+    } else {
+        vresult->u64 = temp;
     }
-
-    *result = temp;
     return TRUE;
 }
 
 static void r300_render_condition(struct pipe_context *pipe,
                                   struct pipe_query *query,
-                                  uint mode)
+                                  boolean condition,
+                                  enum pipe_render_cond_flag mode)
 {
     struct r300_context *r300 = r300_context(pipe);
-    uint64_t result;
+    union pipe_query_result result;
     boolean wait;
 
+    r300->skip_rendering = FALSE;
+
     if (query) {
         wait = mode == PIPE_RENDER_COND_WAIT ||
                mode == PIPE_RENDER_COND_BY_REGION_WAIT;
 
-        if (!r300_get_query_result(pipe, query, wait, &result)) {
-            r300->skip_rendering = FALSE;
+        if (r300_get_query_result(pipe, query, wait, &result)) {
+            if (r300_query(query)->type == PIPE_QUERY_OCCLUSION_PREDICATE) {
+                r300->skip_rendering = condition == result.b;
+            } else {
+                r300->skip_rendering = condition == !!result.u64;
+            }
         }
-
-        r300->skip_rendering = result == 0;
-    } else {
-        r300->skip_rendering = FALSE;
     }
 }
 
-void r300_init_query_functions(struct r300_context* r300) {
+static void
+r300_set_active_query_state(struct pipe_context *pipe, boolean enable)
+{
+}
+
+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.set_active_query_state = r300_set_active_query_state;
     r300->context.render_condition = r300_render_condition;
 }