KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: remove function si_init_atom 

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2018-04-08 21:07:29 -04:00
parent ccebcba893
commit e395475096
4 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -2762,8 +2762,7 @@ void si_init_all_descriptors(struct si_context *sctx)
sctx->b.make_image_handle_resident = si_make_image_handle_resident; sctx->b.make_image_handle_resident = si_make_image_handle_resident;
/* Shader user data. */ /* Shader user data. */
si_init_atom(sctx, &sctx->atoms.s.shader_pointers, sctx->atoms.s.shader_pointers.emit = si_emit_graphics_shader_pointers;
si_emit_graphics_shader_pointers);
/* Set default and immutable mappings. */ /* Set default and immutable mappings. */
si_set_user_data_base(sctx, PIPE_SHADER_VERTEX, R_00B130_SPI_SHADER_USER_DATA_VS_0); si_set_user_data_base(sctx, PIPE_SHADER_VERTEX, R_00B130_SPI_SHADER_USER_DATA_VS_0);

29
src/gallium/drivers/radeonsi/si_state.c
View File

@ -33,13 +33,6 @@
#include "util/u_resource.h" #include "util/u_resource.h"
#include "util/u_upload_mgr.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) static unsigned si_map_swizzle(unsigned swizzle)
{ {
switch (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) void si_init_state_functions(struct si_context *sctx)
{ {
si_init_atom(sctx, &sctx->atoms.s.framebuffer, si_emit_framebuffer_state); sctx->atoms.s.framebuffer.emit = si_emit_framebuffer_state;
si_init_atom(sctx, &sctx->atoms.s.msaa_sample_locs, si_emit_msaa_sample_locs); sctx->atoms.s.msaa_sample_locs.emit = si_emit_msaa_sample_locs;
si_init_atom(sctx, &sctx->atoms.s.db_render_state, si_emit_db_render_state); sctx->atoms.s.db_render_state.emit = si_emit_db_render_state;
si_init_atom(sctx, &sctx->atoms.s.dpbb_state, si_emit_dpbb_state); sctx->atoms.s.dpbb_state.emit = si_emit_dpbb_state;
si_init_atom(sctx, &sctx->atoms.s.msaa_config, si_emit_msaa_config); sctx->atoms.s.msaa_config.emit = si_emit_msaa_config;
si_init_atom(sctx, &sctx->atoms.s.sample_mask, si_emit_sample_mask); sctx->atoms.s.sample_mask.emit = si_emit_sample_mask;
si_init_atom(sctx, &sctx->atoms.s.cb_render_state, si_emit_cb_render_state); sctx->atoms.s.cb_render_state.emit = si_emit_cb_render_state;
si_init_atom(sctx, &sctx->atoms.s.blend_color, si_emit_blend_color); sctx->atoms.s.blend_color.emit = si_emit_blend_color;
si_init_atom(sctx, &sctx->atoms.s.clip_regs, si_emit_clip_regs); sctx->atoms.s.clip_regs.emit = si_emit_clip_regs;
si_init_atom(sctx, &sctx->atoms.s.clip_state, si_emit_clip_state); sctx->atoms.s.clip_state.emit = si_emit_clip_state;
si_init_atom(sctx, &sctx->atoms.s.stencil_ref, si_emit_stencil_ref); sctx->atoms.s.stencil_ref.emit = si_emit_stencil_ref;
sctx->b.create_blend_state = si_create_blend_state; sctx->b.create_blend_state = si_create_blend_state;
sctx->b.bind_blend_state = si_bind_blend_state; sctx->b.bind_blend_state = si_bind_blend_state;

4
src/gallium/drivers/radeonsi/si_state.h
View File

@ -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, void si_rebind_buffer(struct si_context *sctx, struct pipe_resource *buf,
uint64_t old_va); uint64_t old_va);
/* si_state.c */ /* 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_state_functions(struct si_context *sctx);
void si_init_screen_state_functions(struct si_screen *sscreen); void si_init_screen_state_functions(struct si_screen *sscreen);
void void

5
src/gallium/drivers/radeonsi/si_state_shaders.c
View File

@ -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) void si_init_shader_functions(struct si_context *sctx)
{ {
si_init_atom(sctx, &sctx->atoms.s.spi_map, si_emit_spi_map); sctx->atoms.s.spi_map.emit = si_emit_spi_map;
si_init_atom(sctx, &sctx->atoms.s.scratch_state, sctx->atoms.s.scratch_state.emit = si_emit_scratch_state;
si_emit_scratch_state);
sctx->b.create_vs_state = si_create_shader_selector; sctx->b.create_vs_state = si_create_shader_selector;
sctx->b.create_tcs_state = si_create_shader_selector; sctx->b.create_tcs_state = si_create_shader_selector;