freedreno: rebind resource in all contexts

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

diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h
index e2edf15daa93ba47dc4e71210c7a85e0fbe91e05..57a172eede8f7732ede68314bd3a5cdf58b7976e 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.h
+++ b/src/gallium/drivers/freedreno/freedreno_context.h
@@ -143,9 +143,11 @@ enum fd_dirty_3d_state {
        FD_DIRTY_PROG        = BIT(16),
        FD_DIRTY_CONST       = BIT(17),
        FD_DIRTY_TEX         = BIT(18),
+       FD_DIRTY_IMAGE       = BIT(19),
+       FD_DIRTY_SSBO        = BIT(20),
 
        /* only used by a2xx.. possibly can be removed.. */
-       FD_DIRTY_TEXSTATE    = BIT(19),
+       FD_DIRTY_TEXSTATE    = BIT(21),
 };
 
 /* per shader-stage dirty state: */
@@ -160,6 +162,8 @@ enum fd_dirty_shader_state {
 struct fd_context {
        struct pipe_context base;
 
+       struct list_head node;   /* node in screen->context_list */
+
        /* We currently need to serialize emitting GMEM batches, because of
         * VSC state access in the context.
         *
@@ -207,6 +211,11 @@ struct fd_context {
         */
        bool update_active_queries;
 
+       /* Current state of pctx->set_active_query_state() (i.e. "should drawing
+        * be counted against non-perfcounter queries")
+        */
+       bool active_queries;
+
        /* table with PIPE_PRIM_MAX entries mapping PIPE_PRIM_x to
         * DI_PT_x value to use for draw initiator.  There are some
         * slight differences between generation:
@@ -350,6 +359,14 @@ struct fd_context {
        /* handling for barriers: */
        void (*framebuffer_barrier)(struct fd_context *ctx);
 
+       /* logger: */
+       void (*record_timestamp)(struct fd_ringbuffer *ring, struct fd_bo *bo, unsigned offset);
+       uint64_t (*ts_to_ns)(uint64_t ts);
+
+       struct list_head log_chunks;  /* list of flushed log chunks in fifo order */
+       unsigned frame_nr;            /* frame counter (for fd_log) */
+       FILE *log_out;
+
        /*
         * Common pre-cooked VBO state (used for a3xx and later):
         */
@@ -468,15 +485,6 @@ fd_batch_set_stage(struct fd_batch *batch, enum fd_render_stage stage)
 {
        struct fd_context *ctx = batch->ctx;
 
-       /* special case: internal blits (like mipmap level generation)
-        * go through normal draw path (via util_blitter_blit()).. but
-        * we need to ignore the FD_STAGE_DRAW which will be set, so we
-        * don't enable queries which should be paused during internal
-        * blits:
-        */
-       if (batch->stage == FD_STAGE_BLIT && stage != FD_STAGE_NULL)
-               stage = FD_STAGE_BLIT;
-
        if (ctx->query_set_stage)
                ctx->query_set_stage(batch, stage);