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

radeonsi: fix buffer_size in si_compute_shorten_ubyte_buffer

Browse source 
buffer_size is not the full buffer size, but the part of the
buffer that is accessed by the compute shader.

This fixes the assert hit in si_set_shader_buffer.

Fixes: 1a99f50c7f ("radeonsi: use a compute shader to convert unsupported indices format")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29876>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-06-24 15:33:42 +02:00
parent c84d1f5571
commit 84a563cf6f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/radeonsi/si_compute_blit.c
View file

@ -416,9 +416,9 @@ void si_copy_buffer(struct si_context *sctx, struct pipe_resource *dst, struct p
}
void si_compute_shorten_ubyte_buffer(struct si_context *sctx, struct pipe_resource *dst, struct pipe_resource *src,
uint64_t dst_offset, uint64_t src_offset, unsigned size, unsigned flags)
uint64_t dst_offset, uint64_t src_offset, unsigned count, unsigned flags)
{
if (!size)
if (!count)
return;
if (!sctx->cs_ubyte_to_ushort)
@ -432,16 +432,16 @@ void si_compute_shorten_ubyte_buffer(struct si_context *sctx, struct pipe_resour
si_improve_sync_flags(sctx, dst, src, &flags);
struct pipe_grid_info info = {};
set_work_size(&info, 64, 1, 1, size, 1, 1);
set_work_size(&info, 64, 1, 1, count, 1, 1);
struct pipe_shader_buffer sb[2] = {};
sb[0].buffer = dst;
sb[0].buffer_offset = dst_offset;
sb[0].buffer_size = dst->width0;
sb[0].buffer_size = count * 2;
sb[1].buffer = src;
sb[1].buffer_offset = src_offset;
sb[1].buffer_size = src->width0;
sb[1].buffer_size = count;
si_launch_grid_internal_ssbos(sctx, &info, sctx->cs_ubyte_to_ushort, flags, coher,
2, sb, 0x1);