|
@ -236,10 +236,10 @@ void ImGui_ImplGlfwVulkan_RenderDrawLists(ImDrawData* draw_data) |
|
|
VkMappedMemoryRange range[2] = {}; |
|
|
VkMappedMemoryRange range[2] = {}; |
|
|
range[0].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; |
|
|
range[0].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; |
|
|
range[0].memory = g_VertexBufferMemory[g_FrameIndex]; |
|
|
range[0].memory = g_VertexBufferMemory[g_FrameIndex]; |
|
|
range[0].size = vertex_size; |
|
|
range[0].size = VK_WHOLE_SIZE; |
|
|
range[1].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; |
|
|
range[1].sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; |
|
|
range[1].memory = g_IndexBufferMemory[g_FrameIndex]; |
|
|
range[1].memory = g_IndexBufferMemory[g_FrameIndex]; |
|
|
range[1].size = index_size; |
|
|
range[1].size = VK_WHOLE_SIZE; |
|
|
err = vkFlushMappedMemoryRanges(g_Device, 2, range); |
|
|
err = vkFlushMappedMemoryRanges(g_Device, 2, range); |
|
|
ImGui_ImplGlfwVulkan_VkResult(err); |
|
|
ImGui_ImplGlfwVulkan_VkResult(err); |
|
|
vkUnmapMemory(g_Device, g_VertexBufferMemory[g_FrameIndex]); |
|
|
vkUnmapMemory(g_Device, g_VertexBufferMemory[g_FrameIndex]); |
|
@ -304,7 +304,7 @@ void ImGui_ImplGlfwVulkan_RenderDrawLists(ImDrawData* draw_data) |
|
|
scissor.offset.x = (int32_t)(pcmd->ClipRect.x) > 0 ? (int32_t)(pcmd->ClipRect.x) : 0; |
|
|
scissor.offset.x = (int32_t)(pcmd->ClipRect.x) > 0 ? (int32_t)(pcmd->ClipRect.x) : 0; |
|
|
scissor.offset.y = (int32_t)(pcmd->ClipRect.y) > 0 ? (int32_t)(pcmd->ClipRect.y) : 0; |
|
|
scissor.offset.y = (int32_t)(pcmd->ClipRect.y) > 0 ? (int32_t)(pcmd->ClipRect.y) : 0; |
|
|
scissor.extent.width = (uint32_t)(pcmd->ClipRect.z - pcmd->ClipRect.x); |
|
|
scissor.extent.width = (uint32_t)(pcmd->ClipRect.z - pcmd->ClipRect.x); |
|
|
scissor.extent.height = (uint32_t)(pcmd->ClipRect.w - pcmd->ClipRect.y + 1); // TODO: + 1??????
|
|
|
scissor.extent.height = (uint32_t)(pcmd->ClipRect.w - pcmd->ClipRect.y + 1); // FIXME: Why +1 here?
|
|
|
vkCmdSetScissor(g_CommandBuffer, 0, 1, &scissor); |
|
|
vkCmdSetScissor(g_CommandBuffer, 0, 1, &scissor); |
|
|
vkCmdDrawIndexed(g_CommandBuffer, pcmd->ElemCount, 1, idx_offset, vtx_offset, 0); |
|
|
vkCmdDrawIndexed(g_CommandBuffer, pcmd->ElemCount, 1, idx_offset, vtx_offset, 0); |
|
|
} |
|
|
} |
|
|