ilo: rework query support

This fixes some corner cases, but more importantly, the new code should be
easier to reason about.

Signed-off-by: Chia-I Wu <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gallium/drivers/ilo/ilo_query.h b/src/gallium/drivers/ilo/ilo_query.h
index 7fedb2fbe03..e451e4e13af 100644
--- a/src/gallium/drivers/ilo/ilo_query.h
+++ b/src/gallium/drivers/ilo/ilo_query.h
@@ -39,24 +39,24 @@ struct ilo_context;
  */
 struct ilo_query {
    unsigned type;
-   bool active;
+   unsigned index;
 
    struct list_head list;
 
-   /* storage for the collected data */
-   union pipe_query_result data;
+   bool active;
 
    /* for queries that need to read hardware statistics */
+   int cmd_len; /* in dwords, as expected by ilo_cp */
+   bool in_pairs;
    struct intel_bo *bo;
-   int reg_read, reg_total;
-   int reg_cmd_size; /* in dwords, as expected by ilo_cp */
+   int stride, count;
+   int used;
+
+   /* storage for the collected data */
+   union pipe_query_result result;
 };
 
 void
 ilo_init_query_functions(struct ilo_context *ilo);
 
-bool
-ilo_query_alloc_bo(struct ilo_query *q, int reg_count, int repeat_count,
-                   struct intel_winsys *winsys);
-
 #endif /* ILO_QUERY_H */