radv: Fix implicit sync with recent allocation changes.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Wed, 29 Apr 2020 20:35:54 +0000 (22:35 +0200)
committerMarge Bot <eric+marge@anholt.net>
Wed, 29 Apr 2020 21:03:39 +0000 (21:03 +0000)
the implicit sync flag gets set at the beginning at the function,
but I used = instead of |= later.

Fixes: bec92850270 "radv: Stop using memory type indices."
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4814>

src/amd/vulkan/radv_device.c

index 734d3cee515a28bc07b9c6187f4f8d06cfab3002..49cbee18effdea0ece7987bb3fe281f59c531e44 100644 (file)
@@ -5200,7 +5200,7 @@ static VkResult radv_alloc_memory(struct radv_device *device,
 
                heap_index = device->physical_device->memory_properties.memoryTypes[pAllocateInfo->memoryTypeIndex].heapIndex;
                domain = device->physical_device->memory_domains[pAllocateInfo->memoryTypeIndex];
-               flags = device->physical_device->memory_flags[pAllocateInfo->memoryTypeIndex];
+               flags |= device->physical_device->memory_flags[pAllocateInfo->memoryTypeIndex];
 
                if (!dedicate_info && !import_info && (!export_info || !export_info->handleTypes)) {
                        flags |= RADEON_FLAG_NO_INTERPROCESS_SHARING;