ocornut
|
5a7d18a441
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
3 years ago |
|
ocornut
|
d2ffbd9b86
|
Version 1.84
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
|
3 years ago |
|
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
|
3 years ago |
|
ocornut
|
e3988a84db
|
Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)
|
3 years ago |
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
|
3 years ago |
|
ocornut
|
f24abbc47d
|
Fix various warnings (#4442)
|
3 years ago |
|
ocornut
|
b380d3abe3
|
Backends: OpenGL3: Clarify use of GL_POLYGON_MODE.
|
3 years ago |
|
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
|
4 years ago |
|
ocornut
|
cf2daf353e
|
Backends: Cleanup, removed unnecessary create/destroy wrappers. Fix allegro5 backend + use same code as other backend.
+ Update gallery links (#4280)
|
4 years ago |
|
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.
|
4 years ago |
|
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.
|
4 years ago |
|
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.
|
4 years ago |
|
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.
|
4 years ago |
|
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
|
4 years ago |
|
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
-
|
4 years ago |
Chaoya Li
|
2ab7f96f21
|
Backends: OpenGL3: Enable OES_vertex_array_object extension for emscripten/wasm build (#4266, #4267)
|
4 years ago |
|
ocornut
|
ac35b4bba2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
4 years ago |
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
|
4 years ago |
|
ocornut
|
a44d4da87c
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
|
4 years ago |
Tatsuya Yatagawa
|
fe24591411
|
Backends: OpenGL3: Fix access violation due to NULL from glGetStringi. (#4201)
|
4 years ago |
|
ocornut
|
16abfa5eb6
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
4 years ago |
|
ocornut
|
838c16533d
|
Backends: Comments.
|
4 years ago |
|
ocornut
|
1ad1429c6d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
|
4 years ago |
|
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.
|
4 years ago |
|
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
|
4 years ago |
thedmd
|
3c72e5142b
|
Backends: Replace direct access to TextureId with GetTexID() call in ImDrawCmd. (#3761)
|
4 years ago |
|
ocornut
|
34d4bc620d
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
|
4 years ago |
Sam Jones
|
71dda216ef
|
Backends: OpenGL3: Don't try to read GL_CLIP_ORIGIN unless we're OpenGL 4.5. (#3998, #2366, #2186)
|
4 years ago |
|
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
|
4 years ago |
|
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)
|
4 years ago |
|
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
|
4 years ago |
|
ocornut
|
58a0a7058c
|
Backends: Using SetTexID() consistently instead of assigning to ->TexID. May make the later obsolete eventually.
|
4 years ago |
|
ocornut
|
388ca563db
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
|
4 years ago |
|
ocornut
|
b11518d7d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
4 years ago |
|
ocornut
|
9bcf77eb81
|
Fixed using IsItemEdited() after Combo() not matching the return value from Combo(). (#2034) + fix some PVS warnings, fix typo, blanks.
Amend e28b1078
|
4 years ago |
|
ocornut
|
7d5d5711c2
|
Backends: OpenGL2, OpenGL3: Backup and restore GL_SHADE_MODAL, GL_STENCIL_TEST, clear GL_NORMAL_ARRAY. Comments., (#3671, #3668)
|
4 years ago |
|
ocornut
|
e3ac52630a
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
4 years ago |
|
ocornut
|
5292320110
|
Amend ffe8f0177f (#3544) + readme fixes
|
4 years ago |
Louis Schnellbach
|
ffe8f0177f
|
Backends: OpenGL3: Backup/restore GL_PRIMITIVE_RESTART state (#3544)
|
4 years ago |
|
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
|
4 years ago |
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
|
4 years ago |
|
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
|
4 years ago |
|
ocornut
|
b1a18d82e3
|
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
|
4 years ago |
|
ocornut
|
d9b2fb7338
|
Moving backends code from examples/ to backends/ (step 1: moving source files)
|
4 years ago |