imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-03-30 13:05:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source
This commit is contained in:
ocornut
2025-11-11 21:52:31 +01:00
parent 3109131a88 de917ebb95
commit d4c156a0f0
8 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backends/imgui_impl_wgpu.cpp
View File

@@ -1017,7 +1017,7 @@ void ImGui_ImplWGPU_DebugPrintAdapterInfo(const WGPUAdapter& adapter)
wgpuAdapterInfoFreeMembers(info);
}
#if defined(IMGUI_IMPL_WEBGPU_BACKEND_WGPU) || defined(IMGUI_IMPL_WEBGPU_BACKEND_DAWN) && !defined(__EMSCRIPTEN__)
#ifndef __EMSCRIPTEN__
#if defined(__APPLE__)
// MacOS specific: is necessary to compile with "-x objective-c++" flags
@@ -1081,7 +1081,7 @@ WGPUSurface ImGui_ImplWGPU_CreateWGPUSurfaceHelper(ImGui_ImplWGPU_CreateSurfaceI
#endif
return surface;
}
#endif
#endif // #ifndef __EMSCRIPTEN__
//-----------------------------------------------------------------------------