From 0dddd671f87bbed0ef50a104b5ce18314fee7f98 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Sun, 21 Feb 2016 12:59:11 +0100 Subject: [PATCH] Vulkan: Use more approriate barrier --- gfx/common/vulkan_common.c | 2 +- gfx/drivers/vulkan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index 092f865f26..cfa467f5b7 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -125,7 +125,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT); + VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); } #ifdef VULKAN_DEBUG_TEXTURE_ALLOC diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 05819f9e7b..31aa7f63af 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -1380,7 +1380,7 @@ static bool vulkan_frame(void *data, const void *frame, } /* If we have an optimal texture, copy to that now. */ - if (chain->texture_optimal.image) + if (chain->texture_optimal.memory != VK_NULL_HANDLE) { vulkan_copy_staging_to_dynamic(vk, vk->cmd, &chain->texture_optimal, &chain->texture);