From add065f24887a84de146d8ce32894e4f88c1e9fd Mon Sep 17 00:00:00 2001 From: 0x Date: Sun, 27 Jun 2021 16:09:11 +1200 Subject: [PATCH] Pulled upstream fix for vulkan validation layer warnings in imgui_impl_vulkan_with_textures.cpp:CreateOrResizeBuffer --- examples/imgui_impl_vulkan_with_textures.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/imgui_impl_vulkan_with_textures.cpp b/examples/imgui_impl_vulkan_with_textures.cpp index 3ce00f9abef9..39c68d59bea5 100644 --- a/examples/imgui_impl_vulkan_with_textures.cpp +++ b/examples/imgui_impl_vulkan_with_textures.cpp @@ -279,7 +279,7 @@ static void CreateOrResizeBuffer(VkBuffer& buffer, VkDeviceMemory& buffer_memory err = vkBindBufferMemory(v->Device, buffer, buffer_memory, 0); check_vk_result(err); - p_buffer_size = new_size; + p_buffer_size = req.size; } static void ImGui_ImplVulkan_SetupRenderState(ImDrawData* draw_data, VkCommandBuffer command_buffer, ImGui_ImplVulkanH_FrameRenderBuffers* rb, int fb_width, int fb_height) @@ -364,9 +364,9 @@ void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data, VkCommandBuffer comm // Upload vertex/index data into a single contiguous GPU buffer ImDrawVert* vtx_dst = NULL; ImDrawIdx* idx_dst = NULL; - VkResult err = vkMapMemory(v->Device, rb->VertexBufferMemory, 0, vertex_size, 0, (void**)(&vtx_dst)); + VkResult err = vkMapMemory(v->Device, rb->VertexBufferMemory, 0, rb->VertexBufferSize, 0, (void**)(&vtx_dst)); check_vk_result(err); - err = vkMapMemory(v->Device, rb->IndexBufferMemory, 0, index_size, 0, (void**)(&idx_dst)); + err = vkMapMemory(v->Device, rb->IndexBufferMemory, 0, rb->IndexBufferSize, 0, (void**)(&idx_dst)); check_vk_result(err); for (int n = 0; n < draw_data->CmdListsCount; n++) {