mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into docking (require next commit)

Browse source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
This commit is contained in:
ocornut 2026-01-14 19:42:11 +01:00
commit 66e08b6575
14 changed files with 152 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/imgui_impl_wgpu.cpp
View file

@ -1080,7 +1080,7 @@ WGPUSurface ImGui_ImplWGPU_CreateWGPUSurfaceHelper(ImGui_ImplWGPU_CreateSurfaceI
surface = wgpuInstanceCreateSurface(info->Instance, &surface_descriptor);
}
#else
fprintf(stderr, "'CreateWGPUSurfaceHelper' is not implemented for this platform\n");
IM_ASSERT(0 && "Unsupported WebGPU native platform!");
#endif
return surface;
}