From 6e46baa6c25cbf2ac5dda121e754be3281341997 Mon Sep 17 00:00:00 2001 From: AJ Weeks Date: Sat, 11 Sep 2021 10:58:09 +0100 Subject: [PATCH] Merge ocornut/imgui#3957 Vulkan validation fix (nonCoherentAtomSize) --- FlexEngine/dependencies/imgui/imgui_impl_vulkan.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FlexEngine/dependencies/imgui/imgui_impl_vulkan.cpp b/FlexEngine/dependencies/imgui/imgui_impl_vulkan.cpp index 17b501bb7..1295c4a6f 100644 --- a/FlexEngine/dependencies/imgui/imgui_impl_vulkan.cpp +++ b/FlexEngine/dependencies/imgui/imgui_impl_vulkan.cpp @@ -196,7 +196,7 @@ static void CreateOrResizeBuffer(VkBuffer& buffer, VkDeviceMemory& buffer_memory err = vkBindBufferMemory(g_Device, buffer, buffer_memory, 0); check_vk_result(err); - p_buffer_size = new_size; + p_buffer_size = req.size; } // Render function @@ -225,9 +225,9 @@ void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer comm { ImDrawVert* vtx_dst = NULL; ImDrawIdx* idx_dst = NULL; - err = vkMapMemory(g_Device, fd->VertexBufferMemory, 0, vertex_size, 0, (void**)(&vtx_dst)); + err = vkMapMemory(g_Device, fd->VertexBufferMemory, 0, fd->VertexBufferSize, 0, (void**)(&vtx_dst)); check_vk_result(err); - err = vkMapMemory(g_Device, fd->IndexBufferMemory, 0, index_size, 0, (void**)(&idx_dst)); + err = vkMapMemory(g_Device, fd->IndexBufferMemory, 0, fd->IndexBufferSize, 0, (void**)(&idx_dst)); check_vk_result(err); for (int n = 0; n < draw_data->CmdListsCount; n++) {