Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-05-25 01:40:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into docking
build / Windows (push) Waiting to run
Details
build / Linux (push) Waiting to run
Details
build / MacOS (push) Waiting to run
Details
build / iOS (push) Waiting to run
Details
build / Emscripten (push) Waiting to run
Details
build / Android (push) Waiting to run
Details

Browse Source 
# Conflicts:
#	imgui_internal.h
This commit is contained in:
ocornut
2025-03-13 21:01:21 +01:00
parent 2d403a1614 b758b8223f
commit aa97252f60
10 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backends/imgui_impl_dx12.cpp
+1 -1
View File
@@ -833,7 +833,7 @@ bool ImGui_ImplDX12_Init(ImGui_ImplDX12_InitInfo* init_info)
init_info->SrvDescriptorAllocFn = [](ImGui_ImplDX12_InitInfo*, D3D12_CPU_DESCRIPTOR_HANDLE* out_cpu_handle, D3D12_GPU_DESCRIPTOR_HANDLE* out_gpu_handle)
{
ImGui_ImplDX12_Data* bd = ImGui_ImplDX12_GetBackendData();
IM_ASSERT(bd->LegacySingleDescriptorUsed == false);
IM_ASSERT(bd->LegacySingleDescriptorUsed == false && "Only 1 simultaneous texture allowed with legacy ImGui_ImplDX12_Init() signature!");
*out_cpu_handle = bd->InitInfo.LegacySingleSrvCpuDescriptor;
*out_gpu_handle = bd->InitInfo.LegacySingleSrvGpuDescriptor;
bd->LegacySingleDescriptorUsed = true;