From 1e03b63b3bbcfd0375f2ebea2f5b465163807fc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 7 Jan 2020 18:06:14 -0500 Subject: [PATCH] radeonsi: rename desc_list_byte_size -> vb_desc_list_alloc_size Reviewed-by: Pierre-Eric Pelloux-Prayer --- src/gallium/drivers/radeonsi/si_cp_dma.c | 4 ++-- src/gallium/drivers/radeonsi/si_debug.c | 2 +- src/gallium/drivers/radeonsi/si_descriptors.c | 10 ++++------ src/gallium/drivers/radeonsi/si_state.c | 2 +- src/gallium/drivers/radeonsi/si_state.h | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index 974f2b22238..2ef41e44ded 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -433,12 +433,12 @@ static void cik_prefetch_shader_async(struct si_context *sctx, static void cik_prefetch_VBO_descriptors(struct si_context *sctx) { - if (!sctx->vertex_elements || !sctx->vertex_elements->desc_list_byte_size) + if (!sctx->vertex_elements || !sctx->vertex_elements->vb_desc_list_alloc_size) return; cik_prefetch_TC_L2_async(sctx, &sctx->vb_descriptors_buffer->b.b, sctx->vb_descriptors_offset, - sctx->vertex_elements->desc_list_byte_size); + sctx->vertex_elements->vb_desc_list_alloc_size); } /** diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 630d749856d..93ecc08b158 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -868,7 +868,7 @@ static void si_dump_descriptors(struct si_context *sctx, desc.list = sctx->vb_descriptors_gpu_list; desc.gpu_list = sctx->vb_descriptors_gpu_list; desc.element_dw_size = 4; - desc.num_active_slots = sctx->vertex_elements->desc_list_byte_size / 16; + desc.num_active_slots = sctx->vertex_elements->vb_desc_list_alloc_size / 16; si_dump_descriptor_list(sctx->screen, &desc, name, " - Vertex buffer", 4, info->num_inputs, diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index a4cff7d7ccc..76695baa4c3 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1097,8 +1097,6 @@ bool si_upload_vertex_buffer_descriptors(struct si_context *sctx) { struct si_vertex_elements *velems = sctx->vertex_elements; unsigned i, count; - unsigned desc_list_byte_size; - unsigned first_vb_use_mask; uint32_t *ptr; if (!sctx->vertex_buffers_dirty || !velems) @@ -1109,16 +1107,16 @@ bool si_upload_vertex_buffer_descriptors(struct si_context *sctx) if (!count) return true; - desc_list_byte_size = velems->desc_list_byte_size; - first_vb_use_mask = velems->first_vb_use_mask; + unsigned alloc_size = velems->vb_desc_list_alloc_size; + unsigned first_vb_use_mask = velems->first_vb_use_mask; /* Vertex buffer descriptors are the only ones which are uploaded * directly through a staging buffer and don't go through * the fine-grained upload path. */ u_upload_alloc(sctx->b.const_uploader, 0, - desc_list_byte_size, - si_optimal_tcc_alignment(sctx, desc_list_byte_size), + alloc_size, + si_optimal_tcc_alignment(sctx, alloc_size), &sctx->vb_descriptors_offset, (struct pipe_resource**)&sctx->vb_descriptors_buffer, (void**)&ptr); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 4211ef4014a..6b3a3a3be6b 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -4873,7 +4873,7 @@ static void *si_create_vertex_elements(struct pipe_context *ctx, return NULL; v->count = count; - v->desc_list_byte_size = align(count * 16, SI_CPDMA_ALIGNMENT); + v->vb_desc_list_alloc_size = align(count * 16, SI_CPDMA_ALIGNMENT); for (i = 0; i < count; ++i) { const struct util_format_description *desc; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 0b7881749c8..ffc65082615 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -173,7 +173,7 @@ struct si_vertex_elements uint16_t first_vb_use_mask; /* Vertex buffer descriptor list size aligned for optimal prefetch. */ - uint16_t desc_list_byte_size; + uint16_t vb_desc_list_alloc_size; uint16_t instance_divisor_is_one; /* bitmask of inputs */ uint16_t instance_divisor_is_fetched; /* bitmask of inputs */ }; -- 2.30.2