omar
|
770c995365
|
Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2. (#3459) + Add ImGui_ImplVulkanH_CreateWindowSwapChain in ImGui_ImplVulkanH_CreateOrResizeWindow().
|
2020-09-08 22:44:24 +02:00 |
|
omar
|
78f753ffff
|
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455, #3459)
|
2020-09-08 17:02:58 +02:00 |
|
Michel Lesoinne
|
41e2aa2e7a
|
Backends: Vulkan: Separate the pipeline of the dear imgui created windows from the one created with the user's render-pass. (#3455, #3459)
This is mostly for the benefit of multi-viewports.
|
2020-09-08 16:54:48 +02:00 |
|
omar
|
90ea7e2f2f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-06-30 16:43:16 +02:00 |
|
Rokas Kupstys
|
0738611559
|
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
|
2020-06-30 16:37:21 +02:00 |
|
ocornut
|
5d472c4895
|
Merge branch 'master' into docking + fixes for #3259
# Conflicts:
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2020-05-25 18:32:15 +02:00 |
|
ocornut
|
a06eb83359
|
Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259)
|
2020-05-25 18:15:59 +02:00 |
|
ocornut
|
a056603d8b
|
Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow
|
2020-05-25 12:12:02 +02:00 |
|
omar
|
5116eee108
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-05-04 15:05:07 +02:00 |
|
omar
|
d5ce3b43ae
|
Backends: Vulkan: Fixed error in if initial frame has no vertices. (#3177)
|
2020-05-04 11:03:41 +02:00 |
|
Chris Savoie
|
73c30aa085
|
Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed.
|
2020-04-26 20:26:06 +02:00 |
|
ocornut
|
fbaf65b8f6
|
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200.
|
2020-03-06 17:53:09 +01:00 |
|
ocornut
|
f2c7f3b200
|
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)
|
2020-03-06 17:28:32 +01:00 |
|
omar
|
f1b5c742ff
|
Viewports: Add various comments
|
2020-01-20 19:59:55 +01:00 |
|
omar
|
28dd8d7efd
|
Docking: Fixed various conflicts not properly resolved on 813e0c1
New git client confusion.
|
2019-11-27 19:27:44 +01:00 |
|
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
ca63349eb4
|
Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.
|
2019-11-20 11:58:25 +01:00 |
|
Rokas Kupstys
|
6892b81578
|
Remove trailing spaces from bunch of files.
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
|
2019-10-15 16:04:02 +02:00 |
|
omar
|
575df6f192
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
|
2019-09-17 16:35:50 +02:00 |
|
omar
|
aedcd2fb1a
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
|
2019-08-19 21:49:53 +02:00 |
|
Vilya Harvey
|
62143dff64
|
Backends: Vulkan: Added support for specifying multisample count. (#2705, #2706)
|
2019-08-01 11:10:01 -07:00 |
|
Chris Savoie
|
949a9fa2cb
|
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. (#2698)
|
2019-07-29 15:52:30 -07:00 |
|
omar
|
adbbd17cb6
|
Addendum to #2635. Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. (#1542)
|
2019-06-18 23:37:57 +02:00 |
|
omar
|
63310acd58
|
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
|
2019-06-06 16:16:18 +02:00 |
|
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
2019-06-06 16:13:30 +02:00 |
|
omar
|
8dc04a4c9f
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.h
# imgui_demo.cpp
|
2019-05-29 16:32:27 +02:00 |
|
omar
|
7755cbbef2
|
Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. (#2591) + Fix OpenGL3 code missing flag.
|
2019-05-29 16:29:17 +02:00 |
|
omar
|
c72040a715
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2019-05-29 16:20:26 +02:00 |
|
omar
|
b3dd03f582
|
Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. (#2591)
|
2019-05-29 16:13:38 +02:00 |
|
omar
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
2019-05-02 14:56:47 +02:00 |
|
omar
|
ae405b83a4
|
Examples: Added missing per-renderer local changelogs. (#2037, #1639, #2452)
|
2019-04-30 22:28:29 +02:00 |
|
omar
|
5c1cd5c8c7
|
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
2019-04-30 22:15:59 +02:00 |
|
omar
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
2019-04-05 20:30:42 +02:00 |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
2019-04-05 20:27:46 +02:00 |
|
omar
|
d61caf5714
|
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. (#2461, #2348, #2378, #2097)
|
2019-04-05 18:52:45 +02:00 |
|
omar
|
e70f866ed2
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
|
2019-04-05 18:27:15 +02:00 |
|
omar
|
6bc47dfe48
|
Vulkan: Removed superfluous vkInstance parameters being passed along.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|
MindSpunk
|
a45840746e
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 17:04:12 +02:00 |
|
MindSpunk
|
9acb158990
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 16:51:35 +02:00 |
|
omar
|
1ba79baab5
|
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. (#2472, #2461, #2071)
|
2019-04-05 16:33:41 +02:00 |
|
omar
|
01de69de36
|
Vulkan: Note for unsupported feature with multi-viewports. (#2071)
|
2019-04-05 00:25:42 +02:00 |
|
omar
|
8ec24036d7
|
Vulkan: Viewports: Removed redundant field.
|
2019-04-05 00:01:25 +02:00 |
|
omar
|
29269d2aa8
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-04 23:55:33 +02:00 |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
2019-04-04 23:40:28 +02:00 |
|
omar
|
4f54a527ab
|
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071)
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
86f5945f49
|
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
66f4be2e13
|
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. (#2461, #2348, #2378, #2097, #2071, #1677)
|
2019-04-04 22:27:29 +02:00 |
|
omar
|
6bf981c85c
|
Vulkan: More renaming. Comments.
|
2019-04-04 22:20:01 +02:00 |
|