ocornut
|
b0a936e5d4
|
Merge branch 'master' into docking (incl revert of examples refactor)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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
|
2023-02-03 22:38:39 +01:00 |
|
ocornut
|
265b88273e
|
Backends: Fixed pragma warning with old GCC.
|
2023-02-03 16:14:49 +01:00 |
|
ocornut
|
5386ddcd05
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# examples/example_emscripten_opengl3/main.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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_demo.cpp
|
2023-02-02 18:31:26 +01:00 |
|
ocornut
|
f822e07d76
|
Backends: SDL: Removed SDL_MOUSEWHEEL value clamping. (#4019, #6096, #6081)
+ Fix warnings.
|
2023-02-02 15:27:14 +01:00 |
|
ocornut
|
fc3815bfe5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
|
2023-01-03 21:06:09 +01:00 |
|
ocornut
|
5eda547e6f
|
Merge branch 'master' into docking
|
2022-12-06 15:10:09 +01:00 |
|
ocornut
|
713e034d95
|
Backends: OpenGL3: Fix for zealous warning. (#5947)
Consider moving to imgui_impl_opengl3_loader.h ?
|
2022-12-03 15:12:20 +01:00 |
|
ocornut
|
a571933f8b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2022-11-09 15:59:26 +01:00 |
|
ocornut
|
b8b0f9d02e
|
Backends: OpenGL3: Reverted use of glBufferSubData(). (#4468, #4504, #3381, #2981, #4825, #4832, #5127)
|
2022-11-09 15:57:54 +01:00 |
|
ocornut
|
edf522b58a
|
Merge branch 'master' into docking + amends change to nullptr (#5760)
# 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_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui_internal.h
|
2022-10-11 15:59:23 +02:00 |
|
ocornut
|
c54230d14e
|
Backends: Using nullptr instead of NULL. (#5760, #4537) + fix additional warnings.
|
2022-10-11 12:35:41 +02:00 |
|
ocornut
|
11f5be0caf
|
Backends: OpenGL: Add ability to #define IMGUI_IMPL_OPENGL_DEBUG. (#4468, #4825, #4832, #5127, #5655, #5709)
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2022-09-27 14:40:18 +02:00 |
|
ocornut
|
325299f942
|
Backends: OpenGL: Add ability to #define IMGUI_IMPL_OPENGL_DEBUG. (#4468, #4825, #4832, #5127, #5655, #5709)
|
2022-09-27 14:38:40 +02:00 |
|
ocornut
|
7b5a8e4f2b
|
Merge branch 'master' into docking (wanted for #4468, #3381, #2981, #4825, #4832, #5127)
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2022-05-30 15:26:12 +02:00 |
|
xiaozhuai, Weihang Ding
|
e5b2286ca8
|
Backends: OpenGL3: Fix apple TARGET_OS_* not defined warning. (#5321)
|
2022-05-23 12:56:15 +02:00 |
|
ocornut
|
ca222d30c8
|
Backends: OpenGL: Partially revert 1.86 change of using glBufferSubData(): now only done on Intel GPUs. (#4468, #3381, #2981, #4825, #4832, #5127)
Essentially reverts 389982eb for non-Intel GPUs + update imgui_impl_opengl3_loader.h
Amended once (force-pushed).
|
2022-05-23 12:47:40 +02:00 |
|
ocornut
|
6b5a2426d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2022-05-17 11:59:32 +02:00 |
|
ocornut
|
60bea052a9
|
Backends: OpenGL3: Fix state corruption on OpenGL ES 2.0 due to not preserving GL_ELEMENT_ARRAY_BUFFER_BINDING and vertex attribute states. (amends)
|
2022-05-13 18:06:24 +02:00 |
|
Rokas Kupstys
|
b7686a88e9
|
Backends: OpenGL3: Fix state corruption on OpenGL ES 2.0 due to not preserving GL_ELEMENT_ARRAY_BUFFER_BINDING and vertex attribute states.
This change partially reverts 9770c8b21d.
|
2022-05-13 18:03:18 +02:00 |
|
ocornut
|
d666a1d473
|
Backends: OSX, Metal: Amend d111133, tidying up, remove unused, misc tweaks. . (#4821, #2778)
|
2022-05-03 18:14:10 +02:00 |
|
ocornut
|
8dd5425182
|
Merge branch 'master' into docking
# Conflicts:
# docs/TODO.txt
|
2022-04-22 19:15:37 +02:00 |
|
ocornut
|
f7f30476d5
|
Added comments about requirement for bilinear filtering. (#5156, #3245) + Backends: SDL_Renderer: Explicitely call SDL_SetTextureScaleMode(). (#4927)
|
2022-04-07 14:28:08 +02:00 |
|
ocornut
|
377b864bb4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2022-03-23 17:21:34 +01:00 |
|
ocornut
|
fd06ed833b
|
Misc: tweaks + fix warnings on backends withtout -wno-memaccess (#4995, #5104)
|
2022-03-13 17:57:32 +07:00 |
|
ocornut
|
033538731c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
|
2022-02-07 16:18:19 +01:00 |
|
Rokas Kupstys
|
40fd163a3b
|
Backends: OpenGL3: Fix OpenGL ES2 includes on Apple systems.
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
2022-02-07 12:26:19 +01:00 |
|
ocornut
|
0647ba3bad
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
|
2022-01-13 18:36:23 +01:00 |
|
ocornut
|
2aa9959553
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
2021-12-30 21:42:19 +01:00 |
|
ocornut
|
dbeea7220f
|
Backends: Silence overzealous warnings. (#4834) Add comments about SetDragDropPayload() return value. (#4835)
|
2021-12-29 12:44:12 +01:00 |
|
ocornut
|
cd36acc88b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# imgui.cpp
|
2021-12-15 12:10:03 +01:00 |
|
ocornut
|
389982eb5a
|
Backends: OpenGL3: Using buffer orphaning + glBufferSubData(), seems to fix leaks with multi-viewports with some Intel HD drivers.. (#4468, #4504, #2981, #3381)
|
2021-12-15 11:50:00 +01:00 |
|
ocornut
|
848d21b6b5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdlrenderer.cpp
# backends/imgui_impl_sdlrenderer.h
# imgui.cpp
# imgui_widgets.cpp
|
2021-12-01 15:37:40 +01:00 |
|
ocornut
|
440824d431
|
Backends: Fixed early out on empty clip rect. In particular, DX12 backend would warn about it (others not so much). (#4775, #4464)
Amend/fix 2b0bd40b
|
2021-11-30 21:48:29 +01:00 |
|
ocornut
|
835a5344b0
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2021-09-24 15:49:28 +02:00 |
|
ocornut
|
c6ca327fb2
|
Backends: Added more implicit asserts to detect invalid/redundant calls to Shutdown functions. (#4562)
|
2021-09-20 18:43:05 +02:00 |
|
ocornut
|
dedb381c51
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
|
2021-08-30 20:01:16 +02:00 |
|
Rokas Kupstys
|
2b0bd40b99
|
Backends: Metal: Fixed a crash when clipping rect larger than framebuffer is submitted. (#4464)
Backends: Normalize clipping rect handling across backends.
+ Squashed amends.
|
2021-08-24 18:23:13 +02:00 |
|
Siarhei Fiedartsou
|
f8bad7e1e3
|
Backends: OpenGL3: Add TargetConditionals.h (#4473) + standardize include
|
2021-08-24 15:36:44 +02:00 |
|
Nicolas Noble
|
e3e1fbcf02
|
Backends: OpenGL3: OpenGL: Fixed ES 3.0 shader ("#version 300 es") to use normal precision floats. (#4463)
|
2021-08-23 15:03:27 +02:00 |
|
ocornut
|
5a7d18a441
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2021-08-20 18:15:25 +02:00 |
|
ocornut
|
d2ffbd9b86
|
Version 1.84
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
|
2021-08-20 18:03:55 +02:00 |
|
ocornut
|
0b06c4b2b0
|
Merge branch 'master' into docking (will need further for io.AddFocusEvent)
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2021-08-19 17:25:12 +02:00 |
|
ocornut
|
e3988a84db
|
Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)
|
2021-08-19 16:24:59 +02:00 |
|
Rokas Kupstys
|
459de65477
|
Backends: OpenGL3: Embed our own minimal GL loader based on gl3w and use it in SDL/GLFW examples. (#4445)
Loader repository at https://github.com/dearimgui/gl3w_stripped
Removed support for using custom loaders in examples/opengl3 backend
|
2021-08-19 16:24:58 +02:00 |
|
ocornut
|
f24abbc47d
|
Fix various warnings (#4442)
|
2021-08-18 12:38:24 +02:00 |
|
ocornut
|
b380d3abe3
|
Backends: OpenGL3: Clarify use of GL_POLYGON_MODE.
|
2021-08-17 15:16:29 +02:00 |
|
ocornut
|
a11f36811f
|
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_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
2021-07-09 20:16:19 +02:00 |
|
ocornut
|
cf2daf353e
|
Backends: Cleanup, removed unnecessary create/destroy wrappers. Fix allegro5 backend + use same code as other backend.
+ Update gallery links (#4280)
|
2021-06-30 15:50:15 +02:00 |
|
ocornut
|
23a15834fa
|
Fonts: Fix calling ClearTexData() (clearing CPU side font data) triggering an assert in NewFrame(). (#3487) + Backends: added additional assert to facilitate detecting user understand they haven't initialized a backend.
|
2021-06-29 18:16:47 +02:00 |
|
ocornut
|
4cec3a0467
|
Backends: support for multiple imgui context with little testing (#586, #1851, #2004, #3012, #3934, #4141)
I believe more renderer backends should work. GLFW/Win32/SDL/Vulkan probably have many issues.
|
2021-06-29 16:42:13 +02:00 |
|
ocornut
|
0f7eb00f67
|
Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys().
No need to clear fields before deletion. DX12: renamed to match docking branch.
|
2021-06-29 15:31:05 +02:00 |
|
ocornut
|
b5a2bd1a5b
|
Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys().
No need to clear fields before deletion. DX12: renamed to match docking branch.
|
2021-06-29 15:25:19 +02:00 |
|
ocornut
|
682447306d
|
Merge branch 'features/backends_context' 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_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# examples/example_apple_opengl2/main.mm
|
2021-06-29 14:53:25 +02:00 |
|
ocornut
|
70c603854e
|
Backends: moved global to a data structure to facilitate support for multi-contexts. (#586, #1851, #2004, #3012, #3934, #4141)
This is NOT enable multi-contexts for any backends
- in order to make this commit as harmless as possible, while containing all the cruft/renaming
-
|
2021-06-29 14:37:58 +02:00 |
|
Chaoya Li
|
2ab7f96f21
|
Backends: OpenGL3: Enable OES_vertex_array_object extension for emscripten/wasm build (#4266, #4267)
|
2021-06-25 16:19:55 +02:00 |
|
ocornut
|
ac35b4bba2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2021-06-24 18:21:19 +02:00 |
|
Ivan Sokolov
|
0905439c31
|
Backends: OpenGL3: Destroy shader objects right away (#4244)
In OpenGL, after a shader program has been linked, shader objects don't need to be kept neither attached to the program nor in existence
|
2021-06-21 11:51:51 +02:00 |
|
ocornut
|
a44d4da87c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
2021-06-08 18:38:51 +02:00 |
|
Tatsuya Yatagawa
|
fe24591411
|
Backends: OpenGL3: Fix access violation due to NULL from glGetStringi. (#4201)
|
2021-06-05 16:27:31 +02:00 |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2021-06-04 17:28:45 +02:00 |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
2021-05-27 13:59:35 +02:00 |
|
ocornut
|
1ad1429c6d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
2021-05-25 18:45:54 +02:00 |
|
ocornut
|
556689591c
|
Backends: OpenGL3: Handle GL_CLIP_ORIGIN on <4.5 contexts if "GL_ARB_clip_control" extension is detected. (#4170, #3998)
Expecting this to somehow cause another issue but we will fix it when it comes.
|
2021-05-24 23:46:25 +02:00 |
|
ocornut
|
86c2b609ef
|
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
# imgui.cpp
|
2021-05-19 19:05:01 +02:00 |
|
thedmd
|
3c72e5142b
|
Backends: Replace direct access to TextureId with GetTexID() call in ImDrawCmd. (#3761)
|
2021-05-19 18:39:18 +02:00 |
|
ocornut
|
34d4bc620d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
2021-04-15 19:57:52 +02:00 |
|
Sam Jones
|
71dda216ef
|
Backends: OpenGL3: Don't try to read GL_CLIP_ORIGIN unless we're OpenGL 4.5. (#3998, #2366, #2186)
|
2021-04-06 12:39:47 +02:00 |
|
ocornut
|
ffa863a3ba
|
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_opengl3.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
|
2021-02-18 11:41:27 +01:00 |
|
ocornut
|
bda12e5fdd
|
Backends: Rework blending equation to preserve alpha in output buffer accross all backends. (#2693, #2764, #2766, #2873, #3447, #3813, #3816)
Some of the viewport ideas from #2766 are not in there yet (e.g. Vulkan: setting compositeAlpha based on cap.supportedCompositeAlpha)
|
2021-02-18 11:38:41 +01:00 |
|
ocornut
|
7a516a266d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2021-02-09 13:17:24 +01:00 |
|
ocornut
|
58a0a7058c
|
Backends: Using SetTexID() consistently instead of assigning to ->TexID. May make the later obsolete eventually.
|
2021-02-03 18:30:26 +01:00 |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
2021-01-15 19:20:42 +01:00 |
|
ocornut
|
b11518d7d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2021-01-05 16:46:38 +01:00 |
|
ocornut
|
9bcf77eb81
|
Fixed using IsItemEdited() after Combo() not matching the return value from Combo(). (#2034) + fix some PVS warnings, fix typo, blanks.
Amend e28b1078
|
2021-01-04 19:15:20 +01:00 |
|
ocornut
|
7d5d5711c2
|
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., (#3671, #3668)
|
2021-01-03 17:01:54 +01:00 |
|
ocornut
|
e3ac52630a
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-10-31 00:47:57 +01:00 |
|
ocornut
|
5292320110
|
Amend ffe8f0177f (#3544) + readme fixes
|
2020-10-23 11:25:26 +02:00 |
|
Louis Schnellbach
|
ffe8f0177f
|
Backends: OpenGL3: Backup/restore GL_PRIMITIVE_RESTART state (#3544)
|
2020-10-23 11:17:56 +02:00 |
|
ocornut
|
455c21df71
|
Merge branch 'master' into docking + dockspace demo comments
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
# imgui_internal.h
# imgui_widgets.cpp
|
2020-10-19 15:08:32 +02:00 |
|
xndcn
|
127f132447
|
Backends: OpenGL3: Add compatibility of GL_VERSION for GL 2.x (#3530)
GL_MAJOR_VERSION and GL_MINOR_VERSION are available on GL 3.0 and above.
So we have to parse GL_VERSION under GL 2.x
|
2020-10-15 19:48:45 +02:00 |
|
ocornut
|
042a3b01d2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# examples/README.txt
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_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
|
2020-10-14 14:44:03 +02:00 |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
2020-10-14 14:42:00 +02:00 |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
2020-10-14 14:41:40 +02:00 |
|