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 |
|
Thomas Hope
|
923ca4765a
|
Backends: OpenGL3: Fix compile error with IMGUI_IMPL_OPENGL_ES2 and IMGUI_IMPL_OPENGL_DEBUG (#8197)
|
2024-12-02 13:38:47 +01:00 |
|
ocornut
|
cdf21f6773
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2024-11-21 14:52:04 +01:00 |
|
ocornut
|
20360e00ce
|
Merge miscellaneous small changes to reduce drift with texture update branch.
- ImGuiDebugLogFlags_EventFont is yet unused.
|
2024-11-20 21:46:47 +01:00 |
|
ocornut
|
9d6ec825cb
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
2024-10-28 17:27:38 +01:00 |
|
ocornut
|
81b689b969
|
Backends: OpenGL3: added additional debug GL_CALL enclosure for glCreateShader() calls. (#8104)
|
2024-10-28 15:52:37 +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
|
3552df562e
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2024-07-25 16:41:56 +02:00 |
|
Cyao
|
fe09ebbe0a
|
Backends: OpenGL3: Fixed unsupported option warning with apple clang (#7810)
|
2024-07-22 21:10:35 +02:00 |
|
ocornut
|
138d9d0c21
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
|
2024-06-28 16:03:49 +02:00 |
|
ocornut
|
404af57004
|
Backends: OpenGL2, OpenGL3: ImGui_ImplOpenGL3_NewFrame() recreates font texture if it has been destroyed by ImGui_ImplOpenGL3_DestroyFontsTexture(). (#7748)
Analogous to change to Vulkan backend in 1.90.
|
2024-06-28 15:08:54 +02:00 |
|
ocornut
|
5ecef2f321
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
|
2024-05-23 17:25:02 +02:00 |
|
Michal Šlesár
|
4c3eac2c10
|
Backends: OpenGL3: Fixed zealous warning by initializing last_pixel_unpack_buffer. (#7614)
|
2024-05-22 12:01:54 +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
|
0d483a1c89
|
Backends: OpenGL3: Update loader for Linux to support EGL/GLVND. (#7562)
+ #6983
|
2024-05-07 18:23:29 +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
|
b555984a94
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2024-04-18 21:18:18 +02:00 |
|
ocornut
|
9ec299ebe3
|
Backends: OpenGL: Detect ES3 contexts on desktop based on version string, (#7447)
|
2024-04-16 16:18:51 +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 |
|
ocornut
|
82eeafc196
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
|
2024-02-07 22:10:33 +01:00 |
|
ocornut
|
1509842107
|
Backends: OpenGL3: Shallow tweak of compile-time extensions detection.
Detect polygon mode using same method as others (not define/symbol).
IMGUI_IMPL_OPENGL_MAY_HAVE_EXTENSIONS -> IMGUI_IMPL_OPENGL_HAS_EXTENSIONS
|
2024-01-24 15:21:46 +01:00 |
|
Clément Gallet
|
1ce41f6218
|
Backends: OpenGL3: Backup and restore GL_PIXEL_UNPACK_BUFFER. (#7253)
Amended with (bd->GlVersion >= 210) checks.
|
2024-01-24 15:01:59 +01:00 |
|
ocornut
|
2dc85e6e43
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2024-01-10 18:34:23 +01:00 |
|
ocornut
|
a3eea8a75a
|
Backends: OpenGL3: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" and variants, fixing regression on distros missing a symlink. (#6983)
Amend 0f50b52da
|
2024-01-09 23:26:05 +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 |
|
ocornut
|
0f50b52da4
|
Backends: OpenGL3: Update GL3W based imgui_impl_opengl3_loader.h to load "libGL.so" instead of "libGL.so.1". (#6983)
|
2023-11-09 12:38:56 +01:00 |
|
ocornut
|
72ebd91567
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
|
2023-10-05 15:10:45 +02:00 |
|
Nicolas "Pixel" Noble
|
64b1aeebf5
|
Backends: OpenGL3: rename gl3w's loader symbols to allow LTO compilation with another copy of gl3w. (#6875, #6668, #4445)
|
2023-10-05 11:03:28 +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
|
0e8eb8c48e
|
Removed _MSC_VER <= 1500 checks for Visual Studio 2008 or earlier.
Our codebase requires VS2012+ since a while.
|
2023-07-13 12:38:16 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
6b01114057
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2023-06-23 16:04:13 +02:00 |
|
ocornut
|
cb5542bce5
|
Backends: OpenGL3: Fixed erroneous use glGetIntegerv(GL_CONTEXT_PROFILE_MASK) on contexts lower than 3.2. (#6539, #6333)
|
2023-06-20 15:30:52 +02:00 |
|
ocornut
|
1450d23b60
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
|
2023-06-20 15:12:09 +02:00 |
|
ocornut
|
dec082ff97
|
Backends: OpenGL3: Fixed support for glBindSampler() backup/restore on ES3. (#6375, #6508)
Amend dd9db5e8 + 39f7248d4
|
2023-06-12 11:45:11 +02:00 |
|
ocornut
|
823a1385a2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlrenderer.h
# docs/CHANGELOG.txt
# imgui.cpp
|
2023-05-31 14:51:56 +02:00 |
|
ocornut
|
52e19113f3
|
Backends: OpenGL3: Added more explicit comments about using GL ES2/3 on targets where it's not automatic. (#6450)
|
2023-05-23 11:43:16 +02:00 |
|
ocornut
|
530134d125
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2023-05-10 12:57:37 +02:00 |
|
Jason Millard
|
39f7248d4a
|
Backends: OpenGL3: Add glBindSampler for GL ES 3.0. (#6375)
Amended given addition of GlProfileIsES3 in dd9db5e
|
2023-05-09 15:17:18 +02:00 |
|
ocornut
|
dd9db5e889
|
Backends: OpenGL3: Added runtime flags for ES2/ES3 to simplify coding-style. (#6375)
|
2023-05-09 15:09:47 +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 |
|