06e87014f2
Merge branch 'master' into docking
...
# Conflicts:
# imgui.h
# imgui_internal.h
4 years ago
3346544cf5
Examples: Fix batch files (amend b1a18d82, #3513 ), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe.
4 years ago
dd4ca70b0d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
4 years ago
f9b873662b
Backends: Win32: Fixed setting of io.DisplaySize to invalid/uninitialized data when after hwnd has been closed.
...
GetClientRect() fails on closed hwnd which left the rectangle uninitialized and copied to DisplaySize. Ensure it is zero + similar failsafe in io.WantSetMousePos path.
4 years ago
657589ab47
Backends: Vulkan+Viewports: fixed build, removed extraneous pipeline creation ( 770c9953, e8447dea, 6a0e85c5) ( #3459 , #3579 )
4 years ago
b2a91dc390
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
4 years ago
6a0e85c561
Backends: Vulkan: Add override for the subpass to reference during VkPipeline creation. ( #3579 )
...
This allows for binding the pipeline/sending draw commands
(via `ImGui_ImplVulkan_RenderDrawData`) against any subpass, rather than
being restricted to only the first subpass.
Without this, attempting to bind the pipeline against a subpass other than
the first one results in validation layer errors and, at worst, some drivers
failing if the subpass attachments differ.
4 years ago
ac08593b96
Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
4 years ago
b934b9bb86
Backends: OSX, Metal: Fix -Wshadow, -Wimplicit-float-conversion, and -Wsign-conversion warnings. ( #3555 )
4 years ago
e3ac52630a
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
4 years ago
6f57d58e82
Backends: OSX: Fix KeyPadEnter on MacOS. ( #3554 )
4 years ago
5292320110
Amend ffe8f0177f ( #3544 ) + readme fixes
4 years ago
ffe8f0177f
Backends: OpenGL3: Backup/restore GL_PRIMITIVE_RESTART state ( #3544 )
4 years ago
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
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
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
b1a18d82e3
Moving backends code from examples/ to backends/ (step 6: update markdown documentation)
4 years ago
a2a3d80f04
Moving backends code from examples/ to backends/ (step 5: move documentation to MD files)
4 years ago
a2d845f9dd
Moving backends code from examples/ to backends/ (step 4: update documentation, much improvement)
4 years ago
a7e21fb05f
Moving backends code from examples/ to backends/ (step 3: fixing project files)
4 years ago
428f4fce70
Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)
4 years ago
d9b2fb7338
Moving backends code from examples/ to backends/ (step 1: moving source files)
4 years ago
ocornut
Brandon DeRosier
Albin Odervall
Rokas Kupstys
Louis Schnellbach
xndcn