Merge commit 'origin/perrtblend'

[mesa.git] / src / gallium / drivers / nv50 / nv50_query.c

diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 777e77906d5a380996dca49f174596b13460d8cb..9eba4c961158b1e3a61769c1bf0c24c9bb55ab33 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -21,41 +21,137 @@
  */
 
 #include "pipe/p_context.h"
+#include "pipe/p_inlines.h"
 
 #include "nv50_context.h"
 
+struct nv50_query {
+       struct nouveau_bo *bo;
+       unsigned type;
+       boolean ready;
+       uint64_t result;
+};
+
+static INLINE struct nv50_query *
+nv50_query(struct pipe_query *pipe)
+{
+       return (struct nv50_query *)pipe;
+}
+
 static struct pipe_query *
 nv50_query_create(struct pipe_context *pipe, unsigned type)
 {
-       NOUVEAU_ERR("unimplemented\n");
-       return NULL;
+       struct nouveau_device *dev = nouveau_screen(pipe->screen)->device;
+       struct nv50_query *q = CALLOC_STRUCT(nv50_query);
+       int ret;
+
+       assert (q->type == PIPE_QUERY_OCCLUSION_COUNTER);
+       q->type = type;
+
+       ret = nouveau_bo_new(dev, NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 256,
+                            16, &q->bo);
+       if (ret) {
+               FREE(q);
+               return NULL;
+       }
+
+       return (struct pipe_query *)q;
 }
 
 static void
-nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *q)
+nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
 {
-       NOUVEAU_ERR("unimplemented\n");
+       struct nv50_query *q = nv50_query(pq);
+
+       if (q) {
+               nouveau_bo_ref(NULL, &q->bo);
+               FREE(q);
+       }
 }
 
 static void
-nv50_query_begin(struct pipe_context *pipe, struct pipe_query *q)
+nv50_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
 {
-       NOUVEAU_ERR("unimplemented\n");
+       struct nv50_context *nv50 = nv50_context(pipe);
+       struct nouveau_channel *chan = nv50->screen->base.channel;
+       struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct nv50_query *q = nv50_query(pq);
+
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_RESET, 1);
+       OUT_RING  (chan, 1);
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_ENABLE, 1);
+       OUT_RING  (chan, 1);
+
+       q->ready = FALSE;
 }
 
 static void
-nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
+nv50_query_end(struct pipe_context *pipe, struct pipe_query *pq)
 {
-       NOUVEAU_ERR("unimplemented\n");
+       struct nv50_context *nv50 = nv50_context(pipe);
+       struct nouveau_channel *chan = nv50->screen->base.channel;
+       struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct nv50_query *q = nv50_query(pq);
+
+       MARK_RING (chan, 5, 2); /* flush on lack of space or relocs */
+       BEGIN_RING(chan, tesla, NV50TCL_QUERY_ADDRESS_HIGH, 4);
+       OUT_RELOCh(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
+       OUT_RELOCl(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_WR);
+       OUT_RING  (chan, 0x00000000);
+       OUT_RING  (chan, 0x0100f002);
+
+       BEGIN_RING(chan, tesla, NV50TCL_SAMPLECNT_ENABLE, 1);
+       OUT_RING  (chan, 0);
 }
 
 static boolean
-nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
+nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
                  boolean wait, uint64_t *result)
 {
-       NOUVEAU_ERR("unimplemented\n");
-       *result = 0xdeadcafe;
-       return TRUE;
+       struct nv50_query *q = nv50_query(pq);
+       int ret;
+
+       if (!q->ready) {
+               ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD |
+                                    (wait ? 0 : NOUVEAU_BO_NOWAIT));
+               if (ret)
+                       return false;
+               q->result = ((uint32_t *)q->bo->map)[1];
+               q->ready = TRUE;
+               nouveau_bo_unmap(q->bo);
+       }
+
+       *result = q->result;
+       return q->ready;
+}
+
+static void
+nv50_render_condition(struct pipe_context *pipe,
+                     struct pipe_query *pq, uint mode)
+{
+       struct nv50_context *nv50 = nv50_context(pipe);
+       struct nouveau_channel *chan = nv50->screen->base.channel;
+       struct nouveau_grobj *tesla = nv50->screen->tesla;
+       struct nv50_query *q;
+
+       if (!pq) {
+               BEGIN_RING(chan, tesla, NV50TCL_COND_MODE, 1);
+               OUT_RING  (chan, NV50TCL_COND_MODE_ALWAYS);
+               return;
+       }
+       q = nv50_query(pq);
+
+       if (mode == PIPE_RENDER_COND_WAIT ||
+           mode == PIPE_RENDER_COND_BY_REGION_WAIT) {
+               /* XXX: big fence, FIFO semaphore might be better */
+               BEGIN_RING(chan, tesla, 0x0110, 1);
+               OUT_RING  (chan, 0);
+       }
+
+       BEGIN_RING(chan, tesla, NV50TCL_COND_ADDRESS_HIGH, 3);
+       OUT_RELOCh(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+       OUT_RELOCl(chan, q->bo, 0, NOUVEAU_BO_GART | NOUVEAU_BO_RD);
+       OUT_RING  (chan, NV50TCL_COND_MODE_RES);
 }
 
 void
@@ -66,4 +162,5 @@ nv50_init_query_functions(struct nv50_context *nv50)
        nv50->pipe.begin_query = nv50_query_begin;
        nv50->pipe.end_query = nv50_query_end;
        nv50->pipe.get_query_result = nv50_query_result;
+       nv50->pipe.render_condition = nv50_render_condition;
 }