iris: Use iris_flush_bits_for_history in iris_transfer_flush_region

[mesa.git] / src / gallium / drivers / radeonsi / si_pipe.h

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 0fd3ec4675591a061d7660ea64be9352167c90c4..d32feab52c2614bb99dbc22895855c48f6b7db41 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -530,6 +530,7 @@ struct si_screen {
         * the counter before drawing and re-emit the states accordingly.
         */
        unsigned                        dirty_tex_counter;
+       unsigned                        dirty_buf_counter;
 
        /* Atomically increment this counter when an existing texture's
         * metadata is enabled or disabled in a way that requires changing
@@ -606,7 +607,7 @@ struct si_sampler_view {
 #define SI_SAMPLER_STATE_MAGIC 0x34f1c35a
 
 struct si_sampler_state {
-#ifdef DEBUG
+#ifndef NDEBUG
        unsigned                        magic;
 #endif
        uint32_t                        val[4];
@@ -858,8 +859,8 @@ struct si_context {
 
        unsigned                        num_gfx_cs_flushes;
        unsigned                        initial_gfx_cs_size;
-       unsigned                        gpu_reset_counter;
        unsigned                        last_dirty_tex_counter;
+       unsigned                        last_dirty_buf_counter;
        unsigned                        last_compressed_colortex_counter;
        unsigned                        last_num_draw_calls;
        unsigned                        flags; /* flush flags */
@@ -1295,7 +1296,7 @@ void si_log_compute_state(struct si_context *sctx, struct u_log_context *log);
 void si_init_debug_functions(struct si_context *sctx);
 void si_check_vm_faults(struct si_context *sctx,
                        struct radeon_saved_cs *saved, enum ring_type ring);
-bool si_replace_shader(unsigned num, struct ac_shader_binary *binary);
+bool si_replace_shader(unsigned num, struct si_shader_binary *binary);
 
 /* si_dma.c */
 void si_init_dma_functions(struct si_context *sctx);
@@ -1360,7 +1361,8 @@ enum si_prim_discard_outcome {
 void si_build_prim_discard_compute_shader(struct si_shader_context *ctx);
 enum si_prim_discard_outcome
 si_prepare_prim_discard_or_split_draw(struct si_context *sctx,
-                                     const struct pipe_draw_info *info);
+                                     const struct pipe_draw_info *info,
+                                     bool primitive_restart);
 void si_compute_signal_gfx(struct si_context *sctx);
 void si_dispatch_prim_discard_cs_and_draw(struct si_context *sctx,
                                          const struct pipe_draw_info *info,