mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-22 15:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux surface extension bug, make destroy_debug_utils_messenger public

Browse Source 
Making the destroy_messenger public allows code to store the handle directly and
delete it themselves instead of having to hold onto a vkb::Instance, which requires
including the header.
This commit is contained in:
Charles Giessen 2020-10-21 15:32:10 -06:00
parent 6e50441f41
commit d314069e1a
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/VkBootstrap.cpp
View File

@ -630,9 +630,10 @@ detail::Result<Instance> InstanceBuilder::build () const {
#elif defined(_DIRECT2DISPLAY) #elif defined(_DIRECT2DISPLAY)
bool added_window_exts = check_add_window_ext ("VK_KHR_display"); bool added_window_exts = check_add_window_ext ("VK_KHR_display");
#elif defined(__linux__) #elif defined(__linux__)
bool added_window_exts = check_add_window_ext ("VK_KHR_xcb_surface") || // make sure all three calls to check_add_window_ext, don't allow short circuiting
check_add_window_ext ("VK_KHR_xlib_surface") || bool added_window_exts = check_add_window_ext ("VK_KHR_xcb_surface");
check_add_window_ext ("VK_KHR_wayland_surface"); added_window_exts = check_add_window_ext ("VK_KHR_xlib_surface") || added_window_exts;
added_window_exts = check_add_window_ext ("VK_KHR_wayland_surface") || added_window_exts;
#elif defined(__APPLE__) #elif defined(__APPLE__)
bool added_window_exts = check_add_window_ext ("VK_KHR_metal_surface"); bool added_window_exts = check_add_window_ext ("VK_KHR_metal_surface");
#endif #endif
@ -821,6 +822,9 @@ InstanceBuilder& InstanceBuilder::set_allocation_callbacks (VkAllocationCallback
return *this; return *this;
} }
void destroy_debug_messenger(VkInstance const instance, VkDebugUtilsMessengerEXT const messenger);
// ---- Physical Device ---- // // ---- Physical Device ---- //
namespace detail { namespace detail {

2
src/VkBootstrap.h
View File

@ -319,6 +319,8 @@ VKAPI_ATTR VkBool32 VKAPI_CALL default_debug_callback (VkDebugUtilsMessageSeveri
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
void* pUserData); void* pUserData);
void destroy_debug_utils_messenger(VkInstance const instance, VkDebugUtilsMessengerEXT const messenger, VkAllocationCallbacks* allocation_callbacks = nullptr);
// ---- Physical Device ---- // // ---- Physical Device ---- //
class PhysicalDeviceSelector; class PhysicalDeviceSelector;
class DeviceBuilder; class DeviceBuilder;