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 |
|