r600g,radeonsi: don't skip the context flush if a fence should be returned

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

diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h
index a22f5d1c705d7bef2769711395ccefea0cf0e7c8..a71958601aaa8687d038201efbd1ef8ecd372dc4 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pm4.h
+++ b/src/gallium/drivers/radeonsi/si_pm4.h
@@ -57,6 +57,7 @@ struct si_pm4_state
        unsigned                nbo;
        struct r600_resource    *bo[SI_PM4_MAX_BO];
        enum radeon_bo_usage    bo_usage[SI_PM4_MAX_BO];
+       enum radeon_bo_priority bo_priority[SI_PM4_MAX_BO];
 
        /* relocs for shader data */
        unsigned        nrelocs;
@@ -72,7 +73,8 @@ void si_pm4_cmd_end(struct si_pm4_state *state, bool predicate);
 void si_pm4_set_reg(struct si_pm4_state *state, unsigned reg, uint32_t val);
 void si_pm4_add_bo(struct si_pm4_state *state,
                   struct r600_resource *bo,
-                  enum radeon_bo_usage usage);
+                  enum radeon_bo_usage usage,
+                  enum radeon_bo_priority priority);
 
 void si_pm4_sh_data_begin(struct si_pm4_state *state);
 void si_pm4_sh_data_add(struct si_pm4_state *state, uint32_t dw);
@@ -81,15 +83,16 @@ void si_pm4_sh_data_end(struct si_pm4_state *state, unsigned base, unsigned idx)
 void si_pm4_inval_shader_cache(struct si_pm4_state *state);
 void si_pm4_inval_texture_cache(struct si_pm4_state *state);
 
-void si_pm4_free_state(struct si_context *rctx,
+void si_pm4_free_state(struct si_context *sctx,
                       struct si_pm4_state *state,
                       unsigned idx);
-struct si_pm4_state * si_pm4_alloc_state(struct si_context *rctx);
-
-uint32_t si_pm4_sync_flags(struct si_context *rctx);
-unsigned si_pm4_dirty_dw(struct si_context *rctx);
-void si_pm4_emit(struct si_context *rctx, struct si_pm4_state *state);
-void si_pm4_emit_dirty(struct si_context *rctx);
-void si_pm4_reset_emitted(struct si_context *rctx);
+struct si_pm4_state * si_pm4_alloc_state(struct si_context *sctx);
+
+uint32_t si_pm4_sync_flags(struct si_context *sctx);
+unsigned si_pm4_dirty_dw(struct si_context *sctx);
+void si_pm4_emit(struct si_context *sctx, struct si_pm4_state *state);
+void si_pm4_emit_dirty(struct si_context *sctx);
+void si_pm4_reset_emitted(struct si_context *sctx);
+void si_pm4_cleanup(struct si_context *sctx);
 
 #endif