From 6236c9769930f2bc54871dba68c5da86e926a5bf Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 29 Apr 2020 22:35:54 +0200 Subject: [PATCH] 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 Part-of: (cherry picked from commit 85fe0e551fc045d03aa7739d0f1d887484ec6d12) --- .pick_status.json | 2 +- src/amd/vulkan/radv_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9395e86e7b3..a583c070009 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1570,7 +1570,7 @@ "description": "radv: Fix implicit sync with recent allocation changes.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bec92850270a046524056b8d43bbd2554ba9f2e0" }, 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;