imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-02 05:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source
This commit is contained in:
ocornut
2025-06-11 20:53:22 +02:00
parent e43fd75378 7a42233d43
commit 7d70c0ff9f
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backends/imgui_impl_dx12.cpp
View File

@@ -906,6 +906,7 @@ bool ImGui_ImplDX12_Init(ImGui_ImplDX12_InitInfo* init_info)
ImGuiViewport* main_viewport = ImGui::GetMainViewport();
main_viewport->RendererUserData = IM_NEW(ImGui_ImplDX12_ViewportData)(bd->numFramesInFlight);
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
if (init_info->SrvDescriptorAllocFn == nullptr)
{
// Wrap legacy behavior of passing space for a single descriptor