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
|
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
|
8d6e66d38c
|
Backends: DX10, DX11, DX12, OpenGL3, Vulkan, WGPU: Assert when CreateDeviceObjects() calls return false.
|
2025-06-20 09:49:53 +02:00 |
|
ocornut
|
4cf85ee543
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
|
2025-06-13 17:43:30 +02:00 |
|
ocornut
|
571dae9664
|
Backends: WGPU: added ImGuiBackendFlags_RendererHasTextures support. (#8465)
|
2025-06-12 15:31:51 +02:00 |
|
ocornut
|
b178fd4286
|
Backends: WebGPU: moved sampler creation out of ImGui_ImplWGPU_CreateFontsTexture().
|
2025-06-12 14:55:46 +02:00 |
|
ocornut
|
e43fd75378
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_sdlgpu3.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# imgui.cpp
|
2025-06-11 19:04:44 +02:00 |
|
ocornut
|
df068ce11e
|
Various/misc fixes following back-and-forth dynamic_fonts->master->docking merges. Added missing API BREAKING CHANGES section.
|
2025-06-11 18:50:16 +02:00 |
|
ocornut
|
15b96fd051
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2025-02-27 22:01:51 +01:00 |
|
Alan
|
cdafefd4be
|
Backends: WebGPU: Add nextInChain field for VertexAttributes under Dawn (#8438)
|
2025-02-27 13:47:33 +01:00 |
|
Alan
|
8bd3e20c86
|
Backends: WebGPU: include imgui.h before backend check (#8437)
|
2025-02-27 00:06:31 +01:00 |
|
ocornut
|
3fb14b50f8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2025-02-26 21:08:45 +01:00 |
|
Jose L. Hidalgo (PpluX)
|
aaacb01b8d
|
Backends: WebGPU: Recreate image bind groups during render. (#8426, #8046, #7765, #8027)
|
2025-02-26 15:20:08 +01:00 |
|
ocornut
|
9996a2d51b
|
Backends: WebGPU: update code for latest webgpu-native changes. Fix for Emscripten. (#8426)
|
2025-02-26 15:16:38 +01:00 |
|
ocornut
|
6aa0810de5
|
Backends: WebGPU: update code for latest webgpu-native changes. Amend. (#8426)
|
2025-02-26 15:10:28 +01:00 |
|
Jose L. Hidalgo (PpluX)
|
4f4fb1d220
|
Backends: WebGPU: update code for latest webgpu-native changes. (#8426)
|
2025-02-26 14:56:49 +01:00 |
|
ocornut
|
8679cfa2d8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
# imgui.cpp
|
2025-02-07 18:27:32 +01:00 |
|
fdsa
|
4f1d3809c3
|
Fixed tabs and spaces (#8377)
|
2025-02-06 19:54:43 +01: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 |
|
PhantomCloak
|
da0ba9e2fe
|
Backends: WebGPU: add type alias for dawn WGPUProgrammableStageDescriptor -> WGPUComputeState. (#8369)
|
2025-02-03 16:00: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
|
566558b17c
|
Replacing NULL with nullptr in examples/backends when they creeped back. (#6313, #7071, #4537)
|
2024-12-05 12:25:02 +01:00 |
|
ocornut
|
942b64abfc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-10-24 18:15:51 +02:00 |
|
Nicolas Chavez
|
b4033b37ad
|
Backends: WGPU: update for Dawn WGPU String usage. (#8082, #8083)
|
2024-10-24 14:59:06 +02: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
|
f890d85381
|
Backends: Fixed typo in comments from old wip work 'io.BackendRendererRenderState' -> 'platform_io.Renderer_RenderState'. (#6969, #5834, #7468, #3590
Amend e94f95d
|
2024-10-07 22:12:09 +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
|
e94f95d82b
|
Backends: DX11, DX12, Vulkan, WGPU: Expose some backend-specific render state usable for callbacks. (#6969, #5834, #7468, #3590)
|
2024-10-07 21:45:19 +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
|
aa81272900
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
|
2024-09-24 20:31:26 +02:00 |
|
Mark Sibly
|
7f81fbc542
|
Backends: WGPU: Fix new WGPUStringView breaks shader compilation. (#8009, #8010)
|
2024-09-23 13:56:21 +02:00 |
|
ocornut
|
ae8688974b
|
Merge branch 'master' into docking
|
2024-09-17 21:08:03 +02:00 |
|
Aaron C Gaudette
|
1ac162f2b0
|
Backends: WGPU: add IMGUI_IMPL_WEBGPU_BACKEND_DAWN/IMGUI_IMPL_WEBGPU_BACKEND_WGPU to support more targets. (#7977, #7969, #6602, #6188, #7523)
|
2024-09-16 16:26:13 +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
|
4cb0fe3c7d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# docs/CHANGELOG.txt
# imgui_internal.h
|
2024-04-16 14:24:13 +02:00 |
|
ocornut
|
7b8107e7c8
|
Examples: GLFW+WebGPU: Rename example_emscripten_wgpu/ to example_glfw_wgpu/ (#7435, #7132)
|
2024-04-16 14:16:32 +02:00 |
|
ocornut
|
eb42e164dd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
|
2024-01-22 19:01:25 +01:00 |
|
rajveermalviya
|
9266c0d2d1
|
Backends: WebGPU: Avoid leaking pipeline layout. (#7245)
|
2024-01-22 15:37:00 +01:00 |
|
ocornut
|
5fc0a361b2
|
Backends: WebGPU: added ImGui_ImplWGPU_InitInfo::PipelineMultisampleState. (#7240)
|
2024-01-22 14:54:45 +01:00 |
|
ocornut
|
831d42c1ab
|
Backends: WebGPU: ImGui_ImplWGPU_Init() now takes a ImGui_ImplWGPU_InitInfo structure instead of variety of parameters, allowing for easier further changes. (#7240)
|
2024-01-22 14:53:30 +01:00 |
|
ocornut
|
cab7edd135
|
Merge branch 'master' into docking
# Conflicts:
# imgui_internal.h
|
2024-01-17 18:38:03 +01:00 |
|
ocornut
|
03417cc77d
|
Backends: WebGPU: Filling all WGPUDepthStencilState fields explicitly as a recent Dawn update stopped setting default values. (#7232)
|
2024-01-17 13:26:02 +01:00 |
|
ocornut
|
e3d7cd665d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_vulkan.cpp
|
2024-01-03 18:33:44 +01:00 |
|
Axel Paris
|
e8dd47effa
|
Backends: WebGPU: Fixing an issue when opening a popup in the wgpu backend (#7191)
Amend 2b0bd40b9
|
2024-01-03 12:05:37 +01:00 |
|
ocornut
|
450f1d7e7b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2023-11-10 14:56:10 +01:00 |
|
ocornut
|
ab522dd18c
|
Removed IM_OFFSETOF() macro in favor of using offsetof() available in C++11. Kept redirection define. (#4537)
|
2023-11-09 16:44:39 +01:00 |
|