fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-20 18:40:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: remove vb_descriptors_gpu_list only used for debugging

Browse source 
While this is nice to have, it doesn't include VBO descriptors in user
SGPRs, and we need to remove it, so that we can simplify the VBO code.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17933>
This commit is contained in:
Marek Olšák 2022-08-06 09:08:37 -04:00 • committed by Marge Bot
parent b4cef2487b
commit a5d37e161d
4 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/radeonsi/si_debug.c
View file

@ -772,21 +772,6 @@ static void si_dump_descriptors(struct si_context *sctx, gl_shader_stage stage,
enabled_images = sctx->images[processor].enabled_mask;
}
if (stage == MESA_SHADER_VERTEX && sctx->vb_descriptors_buffer &&
sctx->vb_descriptors_gpu_list) {
assert(info); /* only CS may not have an info struct */
struct si_descriptors desc = {};
desc.buffer = sctx->vb_descriptors_buffer;
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->vb_desc_list_alloc_size / 16;
si_dump_descriptor_list(sctx->screen, &desc, name, " - Vertex buffer", 4, info->num_inputs,
si_identity, log);
}
si_dump_descriptor_list(sctx->screen, &descs[SI_SHADER_DESCS_CONST_AND_SHADER_BUFFERS], name,
" - Constant buffer", 4, util_last_bit(enabled_constbuf),
si_get_constbuf_slot, log);

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

@ -2885,7 +2885,6 @@ void si_release_all_descriptors(struct si_context *sctx)
si_release_descriptors(&sctx->descriptors[i]);
si_resource_reference(&sctx->vb_descriptors_buffer, NULL);
sctx->vb_descriptors_gpu_list = NULL; /* points into a mapped buffer */
si_release_bindless_descriptors(sctx);
}

1
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1115,7 +1115,6 @@ struct si_context {
bool vertex_buffer_user_sgprs_dirty;
struct pipe_vertex_buffer vertex_buffer[SI_NUM_VERTEX_BUFFERS];
uint16_t vertex_buffer_unaligned; /* bitmask of not dword-aligned buffers */
uint32_t *vb_descriptors_gpu_list;
struct si_resource *vb_descriptors_buffer;
unsigned vb_descriptors_offset;
unsigned vb_descriptor_user_sgprs[5 * 4];

2
src/gallium/drivers/radeonsi/si_state_draw.cpp
View file

@ -1919,11 +1919,9 @@ static bool si_upload_and_prefetch_VB_descriptors(struct si_context *sctx,
(struct pipe_resource **)&sctx->vb_descriptors_buffer, (void **)&ptr);
if (!sctx->vb_descriptors_buffer) {
sctx->vb_descriptors_offset = 0;
sctx->vb_descriptors_gpu_list = NULL;
return false;
}
sctx->vb_descriptors_gpu_list = ptr;
radeon_add_to_buffer_list(sctx, &sctx->gfx_cs, sctx->vb_descriptors_buffer,
RADEON_USAGE_READ | RADEON_PRIO_DESCRIPTORS);
/* GFX6 doesn't support the L2 prefetch. */