From de36f572d1e49e1b1c1f1755ee1ced193a9ad13b Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Sat, 25 Jun 2016 14:01:10 +0200 Subject: [PATCH] Vulkan: Fix more validation issues. --- gfx/common/vulkan_common.c | 2 ++ gfx/drivers_shader/shader_vulkan.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index a7cdff382f..dddaecb06a 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -1953,6 +1953,8 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk, VkPresentModeKHR swapchain_present_mode = VK_PRESENT_MODE_FIFO_KHR; settings_t *settings = config_get_ptr(); + VKFUNC(vkDeviceWaitIdle)(vk->context.device); + present_mode_count = 0; VKFUNC(vkGetPhysicalDeviceSurfacePresentModesKHR)( vk->context.gpu, vk->vk_surface, diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp index cd60cb65ae..aefb3aa183 100644 --- a/gfx/drivers_shader/shader_vulkan.cpp +++ b/gfx/drivers_shader/shader_vulkan.cpp @@ -1643,7 +1643,7 @@ void Pass::build_commands( if (reflection.ubo_stage_mask) { - set_uniform_buffer(sets[sync_index], 0, + set_uniform_buffer(sets[sync_index], reflection.ubo_binding, common->ubo->get_buffer(), ubo_offset, reflection.ubo_size); }