mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-22 15:21:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,913 Commits 10 Branches 159 Tags
589c83aab9fa4e4b9b02fc7282cdfd55a71024eb
Commit Graph

119 Commits

Author SHA1 Message Date
ocornut
11bd4e7731 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2026-08-04 14:34:04 +02:00
ocornut
9b7699f325 Backends: amend comments to state that bilinear filtering is required ahead of 1.93. 2026-07-31 22:07:01 +02:00
ocornut
a23e9fb1b5 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2026-07-08 15:10:22 +02:00
Kian
520a29dd51 Backends: Metal4: added metal-cpp support. (#9461) 
with amends.
 2026-07-07 16:29:02 +02:00
ocornut
310f3c8370 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	imgui.cpp
 2026-05-06 12:30:38 +02:00
Vlad
dee9b15bbe Backends: Metal: add sampler states and DrawCallback_SetSamplerLinear / DrawCallback_SetSamplerNearest callbacks. (#9381, #9371, #9378) 2026-04-28 15:09:23 +02:00
ocornut
a31071573b Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_sdlrenderer2.cpp
#	backends/imgui_impl_sdlrenderer2.h
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp
 2026-04-23 22:11:04 +02:00
ocornut
86ebb3bc11 Backends: removed samplers from ImGui_ImplDX10_RenderState, ImGui_ImplDX11_RenderState + fixed all Changelogs. (#9378) 2026-04-23 22:03:11 +02:00
ocornut
7e7f3adb80 Removed DrawCallback_SetSamplerCustom feature for now. Too unreliable to get working everywhere. (#9378) 2026-04-23 21:50:52 +02:00
omar
0a811e8ea1 Backends: DX9, DX10, DX11, DX12, Allegro5, OpenGL2, OpenGL3, SDLRenderer2, SDLRenderer3, SDLGPU3, Vulkan: added standard draw callbacks when possible. (#9378) 2026-04-23 21:50:45 +02:00
ocornut
f2f843c113 Fixed some extremely zealous warnings (GCC -Wconversion, -Wdouble-promotion) 
(amend a1e0552)
 2026-04-23 17:23:43 +02:00
ocornut
dee5bf3ec3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp
 2026-04-23 16:07:01 +02:00
ocornut
b065713cec Backends: OpenGL2/3, SDLRenderer2/3, DirectX9, Metal: moved Init/Shutdown code lower in the file. 
Allows to point to local functions without forward declaring them.
 2026-04-23 15:53:28 +02:00
ocornut
329c5a6b3b Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_sdl2.cpp
 2026-04-16 15:29:57 +02:00
Andy Grundman
4b80d409e7 Backends: Metal: use a dedicated bufferCacheLock to avoid crashing when bufferCache is replaced by a new object while being used for synchronize(). (#9367) 
This also removes the dispatch onto main when adding the finished buffers back into the cache. This operation should be fine to run on any thread as long as it's inside the sync block.
 2026-04-14 17:14:08 +02:00
ocornut
bbcc83e999 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
 2026-04-08 21:40:40 +02:00
hunam
49df3116bc Backends: Metal: avoid redundant vertex buffer bind in SetupRenderState. (#9343) 2026-04-03 19:14:23 +02:00
ocornut
e05bd9deb9 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2026-03-20 16:37:35 +01:00
ocornut
0500e546b5 Backends: DX9, Metal, SDLRenderer2/3: fixed more assumptions that ImTextureID_Invald == 0 + Amend Changelogs. (#9310, #9293) 2026-03-19 11:47:01 +01:00
ocornut
2a08c87b8c Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	examples/example_glfw_metal/main.mm
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl2_directx11/main.cpp
#	examples/example_sdl2_opengl2/main.cpp
#	examples/example_sdl2_opengl3/main.cpp
#	examples/example_sdl2_sdlrenderer2/main.cpp
#	examples/example_sdl2_vulkan/main.cpp
#	examples/example_sdl3_directx11/main.cpp
#	examples/example_sdl3_opengl3/main.cpp
#	examples/example_sdl3_sdlgpu3/main.cpp
#	examples/example_sdl3_sdlrenderer3/main.cpp
#	examples/example_sdl3_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/example_win32_opengl3/main.cpp
#	examples/example_win32_vulkan/main.cpp
#	imgui_internal.h
 2026-01-23 16:05:50 +01:00
ocornut
9ce41a92c3 Misc/shallow merges from docking branch to reduce small drift. 2026-01-08 14:31:25 +01:00
ocornut
0f7f6284d7 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2025-10-01 18:41:16 +02:00
ocornut
fc4105c8a8 Backends: DX9,DX10,DX11,DX12,Metal,Vulkan,WGPU,SDLRenderer2,SDLRenderer3: ensure that a texture in _WantDestroy state always turn to _Destroyed. (#8977) 
Amend 9809b0b. Strictly speaking this is not necessary anymore but it seems generally sane to promote this.
 2025-10-01 17:49:22 +02:00
ocornut
aa9476a38a IO: added ImGuiPlatformIO::ClearPlatformHandlers(), ClearRendererHandlers(). Backends: call those on Shutdown(). (#8945, #2769) 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.h
 2025-09-18 17:02:44 +02:00
ocornut
d4f722d5b2 IO: added ImGuiPlatformIO::ClearPlatformHandlers(), ClearRendererHandlers(). Backends: call those on Shutdown(). (#8945, #2769) 2025-09-18 16:58:50 +02:00
ocornut
fe1cee0837 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
 2025-07-22 18:38:50 +09:00
ocornut
336d9212fc Backends: using range-for to iterate draw_data->CmdLists[]. 2025-07-11 17:41:52 +02:00
ocornut
6af6cec23f Merge branch 'master_fonts' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl2.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_sdlgpu3.h
#	backends/imgui_impl_vulkan.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_sdl2_directx11/main.cpp
#	examples/example_sdl2_opengl2/main.cpp
#	examples/example_sdl2_opengl3/main.cpp
#	examples/example_sdl2_vulkan/main.cpp
#	examples/example_sdl3_opengl3/main.cpp
#	examples/example_sdl3_sdlgpu3/main.cpp
#	examples/example_sdl3_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 2025-06-11 18:07:19 +02:00
thedmd
26c017d5ea Backends: Metal: added ImGuiBackendFlags_RendererHasTextures support. 
# Conflicts:
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
 2025-06-11 15:41:05 +02:00
ocornut
c90ea1315a Viewports: added per-viewport FramebufferScale, Platform_GetWindowFramebufferScale() + Backends: GLFW, SDL2, SDL3, Apple: added support. (#1065, #1542, #1676, #1786, #2826, #3757, #5081, #5580, #5592, #6465, #7273, #7779 etc.) 
)

Metal backend is not in charge of writing to DpiScale/FramebufferScale (tho it was a neat workaround).
 2025-05-15 14:43:30 +02:00
ocornut
d80347613a Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_internal.h
 2025-02-03 18:42:24 +01:00
ocornut
5dd84082ab InputTextWithHint(): Fixed buffer overflow when user callback modifies the buffer contents in a way that alters hint visibility. (#8368) 2025-02-03 15:11:22 +01:00
ocornut
204cebc8fc Backends: Metal: Fixed a crash on application resources. (#8367, #7419) [@anszom] 2025-02-03 14:21:53 +01:00
ocornut
d0d571e0d7 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_internal.h
 2025-01-13 14:30:57 +01:00
Daniel Walz
e7fb97208a Backends: Metal: Added missing IM_UNUSED (#8302) 2025-01-09 23:12:07 +01:00
ocornut
960a6f14bf Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_metal.mm
#	imgui.cpp
 2025-01-08 14:36:14 +01:00
Selim Sandal
e6a7c7689f Backends: Metal: Fixed memory leaks. (#8276, #8166) 2025-01-08 12:03:18 +01:00
ocornut
9cc0bf89bd Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
 2025-01-06 17:59:22 +01:00
ocornut
d0021e1621 Backends: Metal: Fixed resource leak when using multiple contexts. (#7419) 2025-01-06 15:01:59 +01:00
ocornut
a9cd0f5e42 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_allegro5.cpp
#	backends/imgui_impl_allegro5.h
#	backends/imgui_impl_android.cpp
#	backends/imgui_impl_android.h
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl2.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl2.h
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp
 2024-12-11 12:27:25 +01:00
ocornut
43fbd7ce84 Backends: standardized top of file comments. 2024-12-05 12:43:04 +01:00
ocornut
368123ab06 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui_draw.cpp
 2024-11-07 19:58:23 +01:00
ocornut
419a9ada16 Ignore clang warning Wnontrivial-memaccess (#8129, #8135) 
Amend 88e2327
Use void* cast in backend where the memset are infrequent.
 2024-11-07 19:08:37 +01:00
ocornut
83660e37e3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glut.cpp
#	backends/imgui_impl_glut.h
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_demo.cpp
 2024-11-06 17:58:35 +01:00
Maya Warrier
88e232739b Ignore clang warning Wnontrivial-memaccess (#8129) 
Produced when memset(this, ..) is used on a non-trivially copyable type
 2024-11-05 10:44:39 +01:00
ocornut
514a97a9b7 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdlrenderer2.cpp
#	backends/imgui_impl_sdlrenderer2.h
#	backends/imgui_impl_sdlrenderer3.cpp
#	backends/imgui_impl_sdlrenderer3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
 2024-10-14 19:23:23 +02:00
ocornut
22503bfe75 Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371) 2024-10-08 20:47:24 +02:00
ocornut
c3629adbeb Backends: Metal: fixed ImTextureID cast. (#1641) 
Amend 92b9498
 2024-10-08 14:34:41 +02:00
ocornut
fa9277d12d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.h
 2024-10-07 22:05:57 +02:00
ocornut
9bd5d8a240 Backends: misc renaming of locals. Use 'draw_list' instead of 'cmd_list'. Avoid using 'ctx'. 
This is likely to trigger merging issues. If it does, best to always get "theirs" and rename in there.
 2024-10-07 17:57:11 +02:00