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)

Fork: 0

mark / imgui

Browse code 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 docking
commit e70f866ed2ca68e6a514db3492cfb90cdb61a435 2 parents 9acb158 + 6bc47df omar authored on 5 Apr 2019

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_glfw_vulkan/main.cpp

Ignore Space Show notes View examples/example_sdl_vulkan/main.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Show line notes below