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 |
|
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
|
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
|
386ce49c58
|
Backends: DirectX9: fixed build typo in 0500e54.
|
2026-03-19 18:17: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
|
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
|
4fde473f38
|
Backends: warning fixes (for docking branch).
|
2025-06-20 15:24:52 +02:00 |
|
ocornut
|
afe20dc9b6
|
Backends: warning fix.
|
2025-06-20 15:23:52 +02:00 |
|
ocornut
|
b580c11303
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
|
2025-06-20 15:19:36 +02:00 |
|
ocornut
|
e97e55adbc
|
Backends: Fixed various warnings discovered when using MinGW GCC 15/Clang on latest backends.
dx12: 'ImGui_ImplDX12_Data* bd' shadowed local in spite of being in lambda.
|
2025-06-20 15:18:00 +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 |
|
ocornut
|
75efba7ec7
|
Backends: DirectX9: added ImGuiBackendFlags_RendererHasTextures support
# Conflicts:
# backends/imgui_impl_dx9.cpp
|
2025-06-11 15:27:11 +02:00 |
|
ocornut
|
9ab0b66f50
|
Backends: fixed comment to state that ImGuiViewport::PlaformHandle is used to store SDL's WindowID, not SDL_Window*. (#7853)
Amend 2d99052
|
2025-02-25 15:55:54 +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 |
|
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
|
ff2d6815ef
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-12-04 19:56:35 +01:00 |
|
ocornut
|
70b6ba4240
|
Clarify that IMGUI_USE_BGRA_PACKED_COLOR requires backend support. (#8201)
|
2024-12-04 10:38:19 +01:00 |
|
ocornut
|
5b7feebfd8
|
Backends: DX9: extract RGBA convert loop as we are going to need it more often.
|
2024-11-21 16:58:02 +01:00 |
|
ocornut
|
dfbf1b4f6b
|
Backends: DX9: cache result of ImGui_ImplDX9_CheckFormatSupport() as we are going to need it more often.
|
2024-11-21 15:24:11 +01:00 |
|
ocornut
|
22503bfe75
|
Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)
|
2024-10-08 20:47:24 +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
|
42206b3d51
|
Backends: DX9, DX10, DX11, DX12, OpenGL, Vulkan, WGPU: Changed default texture sampler to Clamp instead of Repeat/Wrap. (#7468, #7511, #5999, #5502)
|
2024-10-07 22:02:55 +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 |
|
ocornut
|
eabe98f6d5
|
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2024-05-14 16:29:06 +02:00 |
|
ocornut
|
5e23680454
|
Backends: all backends + demo now call IMGUI_CHECKVERSION() to verify ABI compatibility between caller code and compiled version of dear imgui. (#7568)
|
2024-05-13 15:07:13 +02:00 |
|
ocornut
|
e391fe2e66
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2024-05-08 16:17:32 +02:00 |
|
ocornut
|
d15574ce2a
|
Backends: Win32: Removed silent return when calling ImGui_ImplWin32_WndProcHandler() with no active context! (#6275)
Better standardized similar checks in other backends.
|
2024-05-07 16:53:03 +02:00 |
|
ocornut
|
d79514c407
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-02-14 14:32:17 +01:00 |
|
璀境石
|
1d6f0cea0e
|
Backends: DX9: use RGBA texture to avoid conversion if supported
|
2024-02-12 16:05:10 +01:00 |
|
ocornut
|
9064dbd404
|
Backends: DX9: Fixed incorrect assert triggering on reopening session with minimized windows. (#3424)
|
2023-10-02 15:28:22 +02:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
f8f805f046
|
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_glfw.cpp
# 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_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2023-07-20 23:18:47 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
1f2b84a654
|
Backends: clear viewport specific bits in io.BackendFlags on backend Shutdown(). (#6334)
Amend 055e715
|
2023-04-19 16:40:18 +02:00 |
|
ocornut
|
4f692ba840
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
|
2023-04-19 16:35:50 +02:00 |
|
Gereon V
|
055e71518e
|
Backends: clear bits set in io.BackendFlags on backend Shutdown(). Clear BackendPlatformName. (#6334, #6335)
Amended with fix for missing clear for ImGuiBackendFlags_HasGamepad.
|
2023-04-17 14:57:12 +02:00 |
|
ocornut
|
bed11b35d1
|
Fix typos and use nullptr in backends. Amend 506f7e0
|
2023-04-11 16:20:17 +02:00 |
|
ocornut
|
e4233c6fb6
|
Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# 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_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdlrenderer.cpp
# backends/imgui_impl_sdlrenderer.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_widgets.cpp
|
2023-02-07 16:23:49 +01:00 |
|