Revert "radv: fix alignment of DGC command buffers"
authorMarek Olšák <marek.olsak@amd.com>
Thu, 5 Oct 2023 08:54:06 +0000 (04:54 -0400)
committerMarge Bot <emma+marge@anholt.net>
Thu, 5 Oct 2023 19:12:29 +0000 (19:12 +0000)
This reverts commit b01e87423433f6b39d244daee4b59f53baa4a02e.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25558>

src/amd/vulkan/radv_device_generated_commands.c

index 70cf507..e085a63 100644 (file)
@@ -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_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);
+   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]);
 
-   return align(size, ib_size_alignment);
+   return align(size, ib_pad_dw_mask + 1);
 }
 
 static unsigned