radeonsi: unify duplicated code for initial shader compilation

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

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 5ff4f5714f338b94dfd359fc71cb6ddb973a895c..8fd80f73effe69af688d14c193c47da41161c1f6 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -42,7 +42,7 @@
 struct si_screen;
 struct si_shader;
 struct si_shader_selector;
-struct r600_texture;
+struct si_texture;
 struct si_qbo_state;
 
 /* State atoms are callbacks which write a sequence of packets into a GPU
@@ -172,8 +172,24 @@ union si_state {
        struct si_pm4_state     *array[0];
 };
 
+#define SI_STATE_IDX(name) \
+       (offsetof(union si_state, named.name) / sizeof(struct si_pm4_state *))
+#define SI_STATE_BIT(name) (1 << SI_STATE_IDX(name))
 #define SI_NUM_STATES (sizeof(union si_state) / sizeof(struct si_pm4_state *))
 
+static inline unsigned si_states_that_roll_context(void)
+{
+       return (SI_STATE_BIT(blend) |
+               SI_STATE_BIT(rasterizer) |
+               SI_STATE_BIT(dsa) |
+               SI_STATE_BIT(poly_offset) |
+               SI_STATE_BIT(es) |
+               SI_STATE_BIT(gs) |
+               SI_STATE_BIT(vgt_shader_config) |
+               SI_STATE_BIT(vs) |
+               SI_STATE_BIT(ps));
+}
+
 union si_state_atoms {
        struct {
                /* The order matters. */
@@ -191,6 +207,7 @@ union si_state_atoms {
                struct si_atom clip_regs;
                struct si_atom clip_state;
                struct si_atom shader_pointers;
+               struct si_atom guardband;
                struct si_atom scissors;
                struct si_atom viewports;
                struct si_atom stencil_ref;
@@ -200,8 +217,32 @@ union si_state_atoms {
        struct si_atom array[0];
 };
 
+#define SI_ATOM_BIT(name) (1 << (offsetof(union si_state_atoms, s.name) / \
+                                sizeof(struct si_atom)))
 #define SI_NUM_ATOMS (sizeof(union si_state_atoms)/sizeof(struct si_atom*))
 
+static inline unsigned si_atoms_that_roll_context(void)
+{
+       return (SI_ATOM_BIT(streamout_begin) |
+               SI_ATOM_BIT(streamout_enable) |
+               SI_ATOM_BIT(framebuffer) |
+               SI_ATOM_BIT(msaa_sample_locs) |
+               SI_ATOM_BIT(db_render_state) |
+               SI_ATOM_BIT(dpbb_state) |
+               SI_ATOM_BIT(msaa_config) |
+               SI_ATOM_BIT(sample_mask) |
+               SI_ATOM_BIT(cb_render_state) |
+               SI_ATOM_BIT(blend_color) |
+               SI_ATOM_BIT(clip_regs) |
+               SI_ATOM_BIT(clip_state) |
+               SI_ATOM_BIT(guardband) |
+               SI_ATOM_BIT(scissors) |
+               SI_ATOM_BIT(viewports) |
+               SI_ATOM_BIT(stencil_ref) |
+               SI_ATOM_BIT(spi_map) |
+               SI_ATOM_BIT(scratch_state));
+}
+
 struct si_shader_data {
        uint32_t                sh_base[SI_NUM_SHADERS];
 };
@@ -229,6 +270,12 @@ enum si_tracked_reg {
 
        SI_TRACKED_PA_SU_SMALL_PRIM_FILTER_CNTL,
 
+       SI_TRACKED_PA_CL_VS_OUT_CNTL,
+       SI_TRACKED_PA_CL_CLIP_CNTL,
+
+       SI_TRACKED_PA_SC_BINNER_CNTL_0,
+       SI_TRACKED_DB_DFSM_CONTROL,
+
        SI_NUM_TRACKED_REGS,
 };
 
@@ -337,9 +384,6 @@ struct si_buffer_resources {
        unsigned                        enabled_mask;
 };
 
-#define si_pm4_block_idx(member) \
-       (offsetof(union si_state, named.member) / sizeof(struct si_pm4_state *))
-
 #define si_pm4_state_changed(sctx, member) \
        ((sctx)->queued.named.member != (sctx)->emitted.named.member)
 
@@ -349,7 +393,7 @@ struct si_buffer_resources {
 #define si_pm4_bind_state(sctx, member, value) \
        do { \
                (sctx)->queued.named.member = (value); \
-               (sctx)->dirty_states |= 1 << si_pm4_block_idx(member); \
+               (sctx)->dirty_states |= SI_STATE_BIT(member); \
        } while(0)
 
 #define si_pm4_delete_state(sctx, member, value) \
@@ -358,12 +402,12 @@ struct si_buffer_resources {
                        (sctx)->queued.named.member = NULL; \
                } \
                si_pm4_free_state(sctx, (struct si_pm4_state *)(value), \
-                                 si_pm4_block_idx(member)); \
+                                 SI_STATE_IDX(member)); \
        } while(0)
 
 /* si_descriptors.c */
 void si_set_mutable_tex_desc_fields(struct si_screen *sscreen,
-                                   struct r600_texture *tex,
+                                   struct si_texture *tex,
                                    const struct legacy_surf_level *base_level_info,
                                    unsigned base_level, unsigned first_level,
                                    unsigned block_width, bool is_stencil,
@@ -418,7 +462,7 @@ si_make_buffer_descriptor(struct si_screen *screen, struct r600_resource *buf,
                          uint32_t *state);
 void
 si_make_texture_descriptor(struct si_screen *screen,
-                          struct r600_texture *tex,
+                          struct si_texture *tex,
                           bool sampler,
                           enum pipe_texture_target target,
                           enum pipe_format pipe_format,
@@ -448,6 +492,10 @@ bool si_update_shaders(struct si_context *sctx);
 void si_init_shader_functions(struct si_context *sctx);
 bool si_init_shader_cache(struct si_screen *sscreen);
 void si_destroy_shader_cache(struct si_screen *sscreen);
+void si_schedule_initial_compile(struct si_context *sctx, unsigned processor,
+                                struct util_queue_fence *ready_fence,
+                                struct si_compiler_ctx_state *compiler_ctx_state,
+                                void *job, util_queue_execute_func execute);
 void si_get_active_slot_masks(const struct tgsi_shader_info *info,
                              uint32_t *const_and_shader_buffers,
                              uint64_t *samplers_and_images);
@@ -469,7 +517,7 @@ void si_trace_emit(struct si_context *sctx);
 
 /* si_state_msaa.c */
 void si_init_msaa_functions(struct si_context *sctx);
-void si_emit_sample_locations(struct radeon_winsys_cs *cs, int nr_samples);
+void si_emit_sample_locations(struct radeon_cmdbuf *cs, int nr_samples);
 
 /* si_state_streamout.c */
 void si_streamout_buffers_dirty(struct si_context *sctx);