From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Wed, 29 Apr 2020 20:35:54 +0000 (+0200)
Subject: radv: Fix implicit sync with recent allocation changes.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85fe0e551fc045d03aa7739d0f1d887484ec6d12;p=mesa.git

radv: Fix implicit sync with recent allocation changes.

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>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 734d3cee515..49cbee18eff 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -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;