fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeonsi: remove atom parameter from si_upload_descriptors

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-10-08 17:22:20 +02:00
parent 4ddce1b1a4
commit 8d2685d129
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -130,8 +130,7 @@ static void si_release_descriptors(struct si_descriptors *desc)
} }
static bool si_upload_descriptors(struct si_context *sctx, static bool si_upload_descriptors(struct si_context *sctx,
struct si_descriptors *desc, struct si_descriptors *desc)
struct r600_atom * atom)
{ {
unsigned slot_size = desc->element_dw_size * 4; unsigned slot_size = desc->element_dw_size * 4;
unsigned first_slot_offset = desc->first_active_slot * slot_size; unsigned first_slot_offset = desc->first_active_slot * slot_size;
@ -163,9 +162,7 @@ static bool si_upload_descriptors(struct si_context *sctx,
/* The shader pointer should point to slot 0. */ /* The shader pointer should point to slot 0. */
desc->buffer_offset -= first_slot_offset; desc->buffer_offset -= first_slot_offset;
if (atom) si_mark_atom_dirty(sctx, &sctx->shader_pointers.atom);
si_mark_atom_dirty(sctx, atom);
return true; return true;
} }
@ -2156,7 +2153,7 @@ si_create_bindless_descriptor(struct si_context *sctx, uint32_t *desc_list,
/* Re-upload the whole array of bindless descriptors into a new buffer. /* Re-upload the whole array of bindless descriptors into a new buffer.
*/ */
if (!si_upload_descriptors(sctx, desc, &sctx->shader_pointers.atom)) if (!si_upload_descriptors(sctx, desc))
return 0; return 0;
/* Make sure to re-emit the shader pointers for all stages. */ /* Make sure to re-emit the shader pointers for all stages. */
@ -2629,8 +2626,7 @@ static bool si_upload_shader_descriptors(struct si_context *sctx, unsigned mask)
while (dirty) { while (dirty) {
unsigned i = u_bit_scan(&dirty); unsigned i = u_bit_scan(&dirty);
if (!si_upload_descriptors(sctx, &sctx->descriptors[i], if (!si_upload_descriptors(sctx, &sctx->descriptors[i]))
&sctx->shader_pointers.atom))
return false; return false;
} }