From: Zebediah Figura Subject: [PATCH 6/6] wined3d: Do not use a staging buffer if discarding a mappable buffer in adapter_vk_copy_bo_address(). Message-Id: <20210618041939.228411-6-z.figura12@gmail.com> Date: Thu, 17 Jun 2021 23:19:39 -0500 In-Reply-To: <20210618041939.228411-1-z.figura12@gmail.com> References: <20210618041939.228411-1-z.figura12@gmail.com> As in wined3d_buffer_vk_upload_ranges(). Signed-off-by: Zebediah Figura --- dlls/wined3d/adapter_vk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7e7a6b4b0bd..615dc6040f4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1092,8 +1092,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, const st return; } - if (dst_bo && (dst_bo->command_buffer_id > context_vk->completed_command_buffer_id - || !(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))) + if (dst_bo && (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(map_flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id))) { if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) -- 2.30.2