freedreno: use rsc->slice accessor everywhere

[mesa.git] / src / gallium / drivers / freedreno / freedreno_query.h

diff --git a/src/gallium/drivers/freedreno/freedreno_query.h b/src/gallium/drivers/freedreno/freedreno_query.h
index a391a7a0ff8bb80752d5d86cb687600e2db69f7d..e69ff7a88a1dfe5cd2c99d6f1df3a4d9c1cf5ef0 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_query.h
+++ b/src/gallium/drivers/freedreno/freedreno_query.h
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2013 Rob Clark <robclark@freedesktop.org>
  *
@@ -37,10 +35,10 @@ struct fd_query;
 struct fd_query_funcs {
        void (*destroy_query)(struct fd_context *ctx,
                        struct fd_query *q);
-       boolean (*begin_query)(struct fd_context *ctx, struct fd_query *q);
+       bool (*begin_query)(struct fd_context *ctx, struct fd_query *q);
        void (*end_query)(struct fd_context *ctx, struct fd_query *q);
-       boolean (*get_query_result)(struct fd_context *ctx,
-                       struct fd_query *q, boolean wait,
+       bool (*get_query_result)(struct fd_context *ctx,
+                       struct fd_query *q, bool wait,
                        union pipe_query_result *result);
 };
 
@@ -48,6 +46,7 @@ struct fd_query {
        const struct fd_query_funcs *funcs;
        bool active;
        int type;
+       unsigned index;
 };
 
 static inline struct fd_query *
@@ -60,7 +59,16 @@ fd_query(struct pipe_query *pq)
 #define FD_QUERY_BATCH_TOTAL     (PIPE_QUERY_DRIVER_SPECIFIC + 1)  /* total # of batches (submits) */
 #define FD_QUERY_BATCH_SYSMEM    (PIPE_QUERY_DRIVER_SPECIFIC + 2)  /* batches using system memory (GMEM bypass) */
 #define FD_QUERY_BATCH_GMEM      (PIPE_QUERY_DRIVER_SPECIFIC + 3)  /* batches using GMEM */
-#define FD_QUERY_BATCH_RESTORE   (PIPE_QUERY_DRIVER_SPECIFIC + 4)  /* batches requiring GMEM restore */
+#define FD_QUERY_BATCH_NONDRAW   (PIPE_QUERY_DRIVER_SPECIFIC + 4)  /* compute/blit batches */
+#define FD_QUERY_BATCH_RESTORE   (PIPE_QUERY_DRIVER_SPECIFIC + 5)  /* batches requiring GMEM restore */
+#define FD_QUERY_STAGING_UPLOADS (PIPE_QUERY_DRIVER_SPECIFIC + 6)  /* texture/buffer uploads using staging blit */
+#define FD_QUERY_SHADOW_UPLOADS  (PIPE_QUERY_DRIVER_SPECIFIC + 7)  /* texture/buffer uploads that shadowed rsc */
+#define FD_QUERY_VS_REGS         (PIPE_QUERY_DRIVER_SPECIFIC + 8)  /* avg # of VS registers (scaled up by 100x) */
+#define FD_QUERY_FS_REGS         (PIPE_QUERY_DRIVER_SPECIFIC + 9)  /* avg # of VS registers (scaled up by 100x) */
+/* insert any new non-perfcntr queries here, the first perfcntr index
+ * needs to come last!
+ */
+#define FD_QUERY_FIRST_PERFCNTR  (PIPE_QUERY_DRIVER_SPECIFIC + 10)
 
 void fd_query_screen_init(struct pipe_screen *pscreen);
 void fd_query_context_init(struct pipe_context *pctx);
@@ -95,6 +103,12 @@ int pidx(unsigned query_type)
                return 3;
        case PIPE_QUERY_TIMESTAMP:
                return 4;
+
+       case PIPE_QUERY_PRIMITIVES_GENERATED:
+               return 5;
+       case PIPE_QUERY_PRIMITIVES_EMITTED:
+               return 6;
+
        default:
                return -1;
        }