Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / src / mesa / pipe / nv50 / nv50_query.c

diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c
index 51cf6804d7c88b35c2cd75e5496888e9d77331c3..d8c3491c2c5a5ce1ed80b2a4f047b6b4d1ada387 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ b/src/mesa/pipe/nv50/nv50_query.c
@@ -1,30 +1,47 @@
 #include "pipe/p_context.h"
 
 #include "nv50_context.h"
-#include "nv50_dma.h"
+
+static struct pipe_query *
+nv50_query_create(struct pipe_context *pipe, unsigned type)
+{
+       NOUVEAU_ERR("unimplemented\n");
+       return NULL;
+}
 
 static void
-nv50_query_begin(struct pipe_context *pipe, struct pipe_query_object *q)
+nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *q)
 {
        NOUVEAU_ERR("unimplemented\n");
 }
 
 static void
-nv50_query_end(struct pipe_context *pipe, struct pipe_query_object *q)
+nv50_query_begin(struct pipe_context *pipe, struct pipe_query *q)
 {
        NOUVEAU_ERR("unimplemented\n");
 }
 
 static void
-nv50_query_wait(struct pipe_context *pipe, struct pipe_query_object *q)
+nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
+{
+       NOUVEAU_ERR("unimplemented\n");
+}
+
+static boolean
+nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
+                 boolean wait, uint64 *result)
 {
        NOUVEAU_ERR("unimplemented\n");
+       *result = 0xdeadcafe;
+       return TRUE;
 }
 
 void
 nv50_init_query_functions(struct nv50_context *nv50)
 {
+       nv50->pipe.create_query = nv50_query_create;
+       nv50->pipe.destroy_query = nv50_query_destroy;
        nv50->pipe.begin_query = nv50_query_begin;
        nv50->pipe.end_query = nv50_query_end;
-       nv50->pipe.wait_query = nv50_query_wait;
+       nv50->pipe.get_query_result = nv50_query_result;
 }