From b01e87423433f6b39d244daee4b59f53baa4a02e Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 2 Oct 2023 11:37:45 +0200 Subject: [PATCH] radv: fix alignment of DGC command buffers Otherwise, DGC command buffers might not be correctly aligned. This fixes a regression with the vkd3d-proton DGC tests. Fixes: 4f660f99378 ("ac/gpu_info: pad IBs according to ib_size_alignment") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device_generated_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c index e085a63a59a..70cf507029a 100644 --- a/src/amd/vulkan/radv_device_generated_commands.c +++ b/src/amd/vulkan/radv_device_generated_commands.c @@ -142,10 +142,10 @@ radv_get_sequence_size(const struct radv_indirect_command_layout *layout, struct static uint32_t radv_align_cmdbuf_size(const struct radv_device *device, uint32_t size) { - const uint32_t ib_pad_dw_mask = MAX2(device->physical_device->rad_info.ib_pad_dw_mask[AMD_IP_GFX], - device->physical_device->rad_info.ib_pad_dw_mask[AMD_IP_COMPUTE]); + const uint32_t ib_size_alignment = MAX2(device->physical_device->rad_info.ip[AMD_IP_GFX].ib_size_alignment, + device->physical_device->rad_info.ip[AMD_IP_COMPUTE].ib_size_alignment); - return align(size, ib_pad_dw_mask + 1); + return align(size, ib_size_alignment); } static unsigned