etnaviv: enable texture upload memory throttling

[mesa.git] / src / gallium / drivers / etnaviv / etnaviv_query.h

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.h b/src/gallium/drivers/etnaviv/etnaviv_query.h
index cebd66238e064aaec360f4783f8fa96f71026616..f1aa1499088c543e0f6084bfe8fc8978c9f3e7f5 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_query.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_query.h
@@ -35,16 +35,16 @@ struct etna_query;
 
 struct etna_query_funcs {
    void (*destroy_query)(struct etna_context *ctx, struct etna_query *q);
-   boolean (*begin_query)(struct etna_context *ctx, struct etna_query *q);
+   bool (*begin_query)(struct etna_context *ctx, struct etna_query *q);
    void (*end_query)(struct etna_context *ctx, struct etna_query *q);
-   boolean (*get_query_result)(struct etna_context *ctx, struct etna_query *q,
-                               boolean wait, union pipe_query_result *result);
+   bool (*get_query_result)(struct etna_context *ctx, struct etna_query *q,
+                            bool wait, union pipe_query_result *result);
 };
 
 struct etna_query {
    const struct etna_query_funcs *funcs;
    bool active;
-   int type;
+   unsigned type;
 };
 
 static inline struct etna_query *
@@ -53,8 +53,8 @@ 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)
+#define ETNA_PM_QUERY_BASE       (PIPE_QUERY_DRIVER_SPECIFIC + 32)
 
 void
 etna_query_screen_init(struct pipe_screen *pscreen);