fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 12:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Require an alignment of 64 for accel structs

Browse source 
Top level acceleration structures need the bottom
6 bits to store the root ids of instances. If we
don't require that alignment, more "advanced"
allocators like VMA may sub allocate a buffer
which can lead to the 6 getting lost.

Fixes the Khronos ray tracing Vulkan samples.

Closes: #6598
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16870>
This commit is contained in:
Konstantin Seurer 2022-06-04 20:50:49 +02:00 • committed by Marge Bot
parent 9eb40f57a2
commit e8da8fc5b7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/amd/vulkan/radv_device.c
View file

@ -5043,9 +5043,8 @@ radv_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount,
}
static void
radv_get_buffer_memory_requirements(struct radv_device *device,
VkDeviceSize size,
VkBufferCreateFlags flags,
radv_get_buffer_memory_requirements(struct radv_device *device, VkDeviceSize size,
VkBufferCreateFlags flags, VkBufferCreateFlags usage,
VkMemoryRequirements2 *pMemoryRequirements)
{
pMemoryRequirements->memoryRequirements.memoryTypeBits =
@ -5056,6 +5055,14 @@ radv_get_buffer_memory_requirements(struct radv_device *device,
else
pMemoryRequirements->memoryRequirements.alignment = 16;
/* Top level acceleration structures need the bottom 6 bits to store
* the root ids of instances. The hardware also needs bvh nodes to
* be 64 byte aligned.
*/
if (usage & VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR)
pMemoryRequirements->memoryRequirements.alignment =
MAX2(pMemoryRequirements->memoryRequirements.alignment, 64);
pMemoryRequirements->memoryRequirements.size =
align64(size, pMemoryRequirements->memoryRequirements.alignment);
@ -5082,7 +5089,7 @@ radv_GetBufferMemoryRequirements2(VkDevice _device, const VkBufferMemoryRequirem
RADV_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer);
radv_get_buffer_memory_requirements(device, buffer->vk.size, buffer->vk.create_flags,
pMemoryRequirements);
buffer->vk.usage, pMemoryRequirements);
}
VKAPI_ATTR void VKAPI_CALL
@ -5093,7 +5100,7 @@ radv_GetDeviceBufferMemoryRequirements(VkDevice _device,
RADV_FROM_HANDLE(radv_device, device, _device);
radv_get_buffer_memory_requirements(device, pInfo->pCreateInfo->size, pInfo->pCreateInfo->flags,
pMemoryRequirements);
pInfo->pCreateInfo->usage, pMemoryRequirements);
}
VKAPI_ATTR void VKAPI_CALL