X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_query.c;h=d2dc7b73c05b96271bbddc006f610957dd894044;hb=5bcfe905019b6865439ec9e32ce28a2df9ca8659;hp=6223e043210b92c94abee375f4b5c6974de582c9;hpb=66d45567b4e2c6f2585789b68667e6c00b7567e1;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 6223e043210..d2dc7b73c05 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -21,23 +21,25 @@
  * 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"
 #include "r300_emit.h"
-#include "r300_winsys.h"
 
 #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;
     struct r300_query *q;
 
-    if (query_type != PIPE_QUERY_OCCLUSION_COUNTER) {
+    if (query_type != PIPE_QUERY_OCCLUSION_COUNTER &&
+        query_type != PIPE_QUERY_OCCLUSION_PREDICATE &&
+        query_type != PIPE_QUERY_GPU_FINISHED) {
         return NULL;
     }
 
@@ -46,33 +48,33 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
         return NULL;
 
     q->type = query_type;
-    q->domain = R300_DOMAIN_GTT;
-    q->buffer_size = 4096;
 
-    if (r300screen->caps.family == CHIP_FAMILY_RV530)
-        q->num_pipes = r300screen->caps.num_z_pipes;
-    else
-        q->num_pipes = r300screen->caps.num_frag_pipes;
-
-    insert_at_tail(&r300->query_list, q);
-
-    /* Open up the occlusion query buffer. */
-    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);
+    if (query_type == PIPE_QUERY_GPU_FINISHED) {
+        return (struct pipe_query*)q;
+    }
 
+    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_context *r300 = r300_context(pipe);
     struct r300_query* q = r300_query(query);
 
-    r300->rws->buffer_reference(r300->rws, &q->buffer, NULL);
-    remove_from_list(q);
+    pb_reference(&q->buf, NULL);
     FREE(query);
 }
 
@@ -83,21 +85,25 @@ void r300_resume_query(struct r300_context *r300,
     r300_mark_atom_dirty(r300, &r300->query_start);
 }
 
-static void r300_begin_query(struct pipe_context* pipe,
-                             struct pipe_query* query)
+static boolean r300_begin_query(struct pipe_context* pipe,
+                                struct pipe_query* query)
 {
     struct r300_context* r300 = r300_context(pipe);
     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;
     }
 
     q->num_results = 0;
     r300_resume_query(r300, q);
+    return true;
 }
 
 void r300_stop_query(struct r300_context *r300)
@@ -106,131 +112,110 @@ void r300_stop_query(struct r300_context *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 (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_stop_query(r300);
+
+    return true;
 }
 
 static boolean r300_get_query_result(struct pipe_context* pipe,
                                      struct pipe_query* query,
                                      boolean wait,
-                                     void* vresult)
+                                     union pipe_query_result *vresult)
 {
     struct r300_context* r300 = r300_context(pipe);
     struct r300_query *q = r300_query(query);
-    unsigned flags, i;
+    unsigned i;
     uint32_t temp, *map;
-    uint64_t *result = (uint64_t*)vresult;
-
-    if (!q->flushed)
-        pipe->flush(pipe, 0, NULL);
 
-    flags = PIPE_TRANSFER_READ | (!wait ? PIPE_TRANSFER_DONTBLOCK : 0);
+    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 = r300->rws->buffer_map(r300->rws, q->buffer, r300->cs, flags);
+    map = r300->rws->buffer_map(q->buf, r300->cs,
+                                PIPE_TRANSFER_READ |
+                                (!wait ? PIPE_TRANSFER_DONTBLOCK : 0));
     if (!map)
         return FALSE;
 
     /* Sum up the results. */
     temp = 0;
     for (i = 0; i < q->num_results; i++) {
-        temp += *map;
+        /* Convert little endian values written by GPU to CPU byte order */
+        temp += util_le32_to_cpu(*map);
         map++;
     }
 
-    r300->rws->buffer_unmap(r300->rws, q->buffer);
-
-    *result = temp;
+    if (q->type == PIPE_QUERY_OCCLUSION_PREDICATE) {
+        vresult->b = temp != 0;
+    } else {
+        vresult->u64 = 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 = 0;
+    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;
-        } else {
-            r300->skip_rendering = result == 0;
+        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;
+            }
         }
-    } 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_set_active_query_state(struct pipe_context *pipe, boolean enable)
 {
 }
 
-static void r300_fake_begin_query(struct pipe_context* pipe,
-                                  struct pipe_query* query)
+void r300_init_query_functions(struct r300_context* r300)
 {
-}
-
-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) {
-    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;
-    }
+    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;
 }