radeonsi: remove function si_init_atom

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 4efae97..8bb2a5d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -2762,8 +2762,7 @@ void si_init_all_descriptors(struct si_context *sctx)
        sctx->b.make_image_handle_resident = si_make_image_handle_resident;
 
        /* Shader user data. */
-       si_init_atom(sctx, &sctx->atoms.s.shader_pointers,
-                    si_emit_graphics_shader_pointers);
+       sctx->atoms.s.shader_pointers.emit = si_emit_graphics_shader_pointers;
 
        /* Set default and immutable mappings. */
        si_set_user_data_base(sctx, PIPE_SHADER_VERTEX, R_00B130_SPI_SHADER_USER_DATA_VS_0);

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 90416b3..7205c6d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -33,13 +33,6 @@
 #include "util/u_resource.h"
 #include "util/u_upload_mgr.h"
 
-/* Initialize an atom owned by radeonsi.  */
-void si_init_atom(struct si_context *sctx, struct si_atom *atom,
-                 void (*emit_func)(struct si_context *ctx, struct si_atom *state))
-{
-       atom->emit = emit_func;
-}
-
 static unsigned si_map_swizzle(unsigned swizzle)
 {
        switch (swizzle) {
@@ -4518,17 +4511,17 @@ static void si_init_config(struct si_context *sctx);
 
 void si_init_state_functions(struct si_context *sctx)
 {
-       si_init_atom(sctx, &sctx->atoms.s.framebuffer, si_emit_framebuffer_state);
-       si_init_atom(sctx, &sctx->atoms.s.msaa_sample_locs, si_emit_msaa_sample_locs);
-       si_init_atom(sctx, &sctx->atoms.s.db_render_state, si_emit_db_render_state);
-       si_init_atom(sctx, &sctx->atoms.s.dpbb_state, si_emit_dpbb_state);
-       si_init_atom(sctx, &sctx->atoms.s.msaa_config, si_emit_msaa_config);
-       si_init_atom(sctx, &sctx->atoms.s.sample_mask, si_emit_sample_mask);
-       si_init_atom(sctx, &sctx->atoms.s.cb_render_state, si_emit_cb_render_state);
-       si_init_atom(sctx, &sctx->atoms.s.blend_color, si_emit_blend_color);
-       si_init_atom(sctx, &sctx->atoms.s.clip_regs, si_emit_clip_regs);
-       si_init_atom(sctx, &sctx->atoms.s.clip_state, si_emit_clip_state);
-       si_init_atom(sctx, &sctx->atoms.s.stencil_ref, si_emit_stencil_ref);
+       sctx->atoms.s.framebuffer.emit = si_emit_framebuffer_state;
+       sctx->atoms.s.msaa_sample_locs.emit = si_emit_msaa_sample_locs;
+       sctx->atoms.s.db_render_state.emit = si_emit_db_render_state;
+       sctx->atoms.s.dpbb_state.emit = si_emit_dpbb_state;
+       sctx->atoms.s.msaa_config.emit = si_emit_msaa_config;
+       sctx->atoms.s.sample_mask.emit = si_emit_sample_mask;
+       sctx->atoms.s.cb_render_state.emit = si_emit_cb_render_state;
+       sctx->atoms.s.blend_color.emit = si_emit_blend_color;
+       sctx->atoms.s.clip_regs.emit = si_emit_clip_regs;
+       sctx->atoms.s.clip_state.emit = si_emit_clip_state;
+       sctx->atoms.s.stencil_ref.emit = si_emit_stencil_ref;
 
        sctx->b.create_blend_state = si_create_blend_state;
        sctx->b.bind_blend_state = si_bind_blend_state;

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index 4ee69b9..5e3c543 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -379,10 +379,6 @@ void si_bindless_descriptor_slab_free(void *priv, struct pb_slab *pslab);
 void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf,
                      uint64_t old_va);
 /* si_state.c */
-struct si_shader_selector;
-
-void si_init_atom(struct si_context *sctx, struct si_atom *atom,
-                 void (*emit_func)(struct si_context *ctx, struct si_atom *state));
 void si_init_state_functions(struct si_context *sctx);
 void si_init_screen_state_functions(struct si_screen *sscreen);
 void

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 747a2ab..c073b8d 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -3409,9 +3409,8 @@ void *si_get_blit_vs(struct si_context *sctx, enum blitter_attrib_type type,
 
 void si_init_shader_functions(struct si_context *sctx)
 {
-       si_init_atom(sctx, &sctx->atoms.s.spi_map, si_emit_spi_map);
-       si_init_atom(sctx, &sctx->atoms.s.scratch_state,
-                    si_emit_scratch_state);
+       sctx->atoms.s.spi_map.emit = si_emit_spi_map;
+       sctx->atoms.s.scratch_state.emit = si_emit_scratch_state;
 
        sctx->b.create_vs_state = si_create_shader_selector;
        sctx->b.create_tcs_state = si_create_shader_selector;