etnaviv: move sw query defines to etnaviv_query_sw.h

Also add new define ETNA_SW_QUERY_BASE.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Wladimir J. van der Laan <laanwj@gmail.com>

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.h b/src/gallium/drivers/etnaviv/etnaviv_query.h
index cebd66238e064aaec360f4783f8fa96f71026616..e099e10f7c562d360fc3bc177c2bd2a0a3168aad 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_query.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_query.h
@@ -53,8 +53,7 @@ etna_query(struct pipe_query *pq)
    return (struct etna_query *)pq;
 }
 
-#define ETNA_QUERY_DRAW_CALLS    (PIPE_QUERY_DRIVER_SPECIFIC + 0)
-#define ETNA_QUERY_RS_OPERATIONS (PIPE_QUERY_DRIVER_SPECIFIC + 1)
+#define ETNA_SW_QUERY_BASE       (PIPE_QUERY_DRIVER_SPECIFIC + 0)
 
 void
 etna_query_screen_init(struct pipe_screen *pscreen);

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_sw.h b/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
index f07d0f5915de84e5d7014f6bb265ca40dc3e6c2d..9321147094d6244485952b843f2b781b21394da6 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
@@ -30,6 +30,9 @@
 
 #include "etnaviv_query.h"
 
+#define ETNA_QUERY_DRAW_CALLS    (ETNA_SW_QUERY_BASE + 0)
+#define ETNA_QUERY_RS_OPERATIONS (ETNA_SW_QUERY_BASE + 1)
+
 struct etna_sw_query {
    struct etna_query base;
    uint64_t begin_value, end_value;