ocornut b61e56346a Merge branch 'master' into docking ...

# Conflicts:
#	imgui_demo.cpp

2026-05-12 16:43:34 +02:00

..

sdlgpu3

Backends: SDL_GPU3: use MSL on macOS and MetalLib on iOS to fix shader compatibility. (#9076)

2025-11-26 15:01:03 +01:00

vulkan

Backends: Vulkan: remove unused artefacts (mistakenly commited in 0453ae9).

2026-04-23 16:08:11 +02:00

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_android.cpp

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_android.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_dx9.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx9.h

Merge branch 'master' into docking

2026-01-23 16:05:50 +01:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx10.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx11.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2026-02-17 18:09:30 +01:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking

2026-02-10 20:52:55 +01:00

imgui_impl_glut.cpp

Merge branch 'master' into docking

2025-02-07 18:27:32 +01:00

imgui_impl_glut.h

Merge branch 'master' into docking

2024-12-11 12:27:25 +01:00

imgui_impl_metal.h

Merge branch 'master' into docking

2026-05-06 12:30:38 +02:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2026-05-06 12:30:38 +02:00

imgui_impl_null.cpp

Backends: fixed misc zealous Clang warnings.

2025-11-18 16:34:35 +01:00

imgui_impl_null.h

Backends: Null: added imgui_impl_null platform/renderer backend.

2025-11-17 15:28:03 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL3: Fixed embedded loader multiple init/shutdown cycles broken on some platforms. (#8792, #9112)

2025-12-11 18:28:23 +01:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2026-04-24 17:36:26 +02:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2026-01-23 16:05:50 +01:00

imgui_impl_osx.h

Viewports: rename ImGuiBackendFlags_HasParentViewportId->ImGuiBackendFlags_HasParentViewport. (#8948)

2025-10-02 16:20:24 +02:00

imgui_impl_osx.mm

Merge branch 'master' into docking

2026-01-23 16:05:50 +01:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdl2.h

Merge branch 'master' into docking

2026-02-17 18:09:30 +01:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2026-02-17 18:09:30 +01:00

imgui_impl_sdlgpu3_shaders.h

Backends: SDL_GPU3: use MSL on macOS and MetalLib on iOS to fix shader compatibility. (#9076)

2025-11-26 15:01:03 +01:00

imgui_impl_sdlgpu3.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdlgpu3.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2026-04-23 16:07:01 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2026-05-12 16:43:34 +02:00

imgui_impl_wgpu.h

Removed DrawCallback_SetSamplerCustom feature for now. Too unreliable to get working everywhere. (#9378)

2026-04-23 21:50:52 +02:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2026-04-23 22:11:04 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

2026-01-23 16:05:50 +01:00