sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vulkan: Move device-level extension to Vk::Device

Browse Source 
Former-commit-id: a73c8cd9744517baea7a5fbd440ccb4d90e9bfc7
This commit is contained in:
Lynix
2016-04-29 22:45:54 +02:00
parent 81e2c3817a
commit da3682149c
4 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Nazara/Vulkan/VkDevice.cpp
View File

@@ -35,6 +35,20 @@ namespace Nz
NAZARA_VULKAN_LOAD_DEVICE(vkDestroyDevice);
NAZARA_VULKAN_LOAD_DEVICE(vkDeviceWaitIdle);
NAZARA_VULKAN_LOAD_DEVICE(vkGetDeviceQueue);
// VK_KHR_display_swapchain
if (m_instance.IsExtensionLoaded("VK_KHR_display_swapchain"))
NAZARA_VULKAN_LOAD_DEVICE(vkCreateSharedSwapchainsKHR);
// VK_KHR_swapchain
if (m_instance.IsExtensionLoaded("VK_KHR_swapchain"))
{
NAZARA_VULKAN_LOAD_DEVICE(vkAcquireNextImageKHR);
NAZARA_VULKAN_LOAD_DEVICE(vkCreateSwapchainKHR);
NAZARA_VULKAN_LOAD_DEVICE(vkDestroySwapchainKHR);
NAZARA_VULKAN_LOAD_DEVICE(vkGetSwapchainImagesKHR);
NAZARA_VULKAN_LOAD_DEVICE(vkQueuePresentKHR);
}
}
catch (const std::exception& e)
{

14
src/Nazara/Vulkan/VkInstance.cpp
View File

@@ -64,10 +64,6 @@ namespace Nz
NAZARA_VULKAN_LOAD_INSTANCE(vkGetPhysicalDeviceDisplayPropertiesKHR);
}
// VK_KHR_display_swapchain
if (IsExtensionLoaded("VK_KHR_display_swapchain"))
NAZARA_VULKAN_LOAD_INSTANCE(vkCreateSharedSwapchainsKHR);
// VK_KHR_surface
if (IsExtensionLoaded("VK_KHR_display"))
{
@@ -78,16 +74,6 @@ namespace Nz
NAZARA_VULKAN_LOAD_INSTANCE(vkGetPhysicalDeviceSurfaceSupportKHR);
}
// VK_KHR_swapchain
if (IsExtensionLoaded("VK_KHR_swapchain"))
{
NAZARA_VULKAN_LOAD_INSTANCE(vkAcquireNextImageKHR);
NAZARA_VULKAN_LOAD_INSTANCE(vkCreateSwapchainKHR);
NAZARA_VULKAN_LOAD_INSTANCE(vkDestroySwapchainKHR);
NAZARA_VULKAN_LOAD_INSTANCE(vkGetSwapchainImagesKHR);
NAZARA_VULKAN_LOAD_INSTANCE(vkQueuePresentKHR);
}
// VK_EXT_debug_report
if (IsExtensionLoaded("VK_EXT_debug_report"))
{