Move Vulkan functions list to external files

This commit is contained in:
Lynix
2020-03-08 18:09:45 +01:00
parent f830dbf6d4
commit 0e27c2315f
6 changed files with 249 additions and 430 deletions

View File

@@ -44,141 +44,19 @@ namespace Nz
m_loadedLayers.emplace(createInfo.ppEnabledLayerNames[i]);
// Load all device-related functions
#define NAZARA_VULKANRENDERER_LOAD_DEVICE(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func))
try
{
ErrorFlags flags(ErrorFlag_ThrowException, true);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkAllocateCommandBuffers);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkAllocateDescriptorSets);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkAllocateMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkBeginCommandBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkBindBufferMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkBindImageMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBeginQuery);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBeginRenderPass);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBindDescriptorSets);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBindIndexBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBindPipeline);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBindVertexBuffers);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdBlitImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdClearAttachments);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdClearColorImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdClearDepthStencilImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdCopyBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdCopyBufferToImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdCopyImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdCopyImageToBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdCopyQueryPoolResults);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDispatch);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDispatchIndirect);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDraw);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDrawIndexed);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDrawIndexedIndirect);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdDrawIndirect);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdEndQuery);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdEndRenderPass);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdExecuteCommands);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdFillBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdNextSubpass);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdPipelineBarrier);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdPushConstants);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdResetEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdResetQueryPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdResolveImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetBlendConstants);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetDepthBias);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetDepthBounds);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetLineWidth);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetScissor);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetStencilCompareMask);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetStencilReference);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetStencilWriteMask);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdSetViewport);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdUpdateBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdWaitEvents);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCmdWriteTimestamp);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateBufferView);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateCommandPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateComputePipelines);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateDescriptorPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateDescriptorSetLayout);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateFence);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateFramebuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateGraphicsPipelines);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateImageView);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreatePipelineCache);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreatePipelineLayout);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateRenderPass);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateSampler);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateSemaphore);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateShaderModule);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyBufferView);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyCommandPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyDescriptorPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyDescriptorSetLayout);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyDevice);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyFence);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyFramebuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyImage);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyImageView);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyPipeline);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyPipelineCache);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyPipelineLayout);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyRenderPass);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroySampler);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroySemaphore);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroyShaderModule);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDeviceWaitIdle);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkEndCommandBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkFreeCommandBuffers);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkFreeDescriptorSets);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkFreeMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkFlushMappedMemoryRanges);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetBufferMemoryRequirements);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetDeviceMemoryCommitment);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetDeviceQueue);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetEventStatus);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetFenceStatus);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetImageMemoryRequirements);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetImageSparseMemoryRequirements);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetImageSubresourceLayout);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetRenderAreaGranularity);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkInvalidateMappedMemoryRanges);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkMapMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkMergePipelineCaches);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkQueueSubmit);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkQueueWaitIdle);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkResetCommandBuffer);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkResetCommandPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkResetDescriptorPool);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkResetFences);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkResetEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkSetEvent);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkUnmapMemory);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkUpdateDescriptorSets);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkWaitForFences);
#define NAZARA_VULKANRENDERER_DEVICE_EXT_BEGIN(ext) if (IsExtensionLoaded(#ext)) {
#define NAZARA_VULKANRENDERER_DEVICE_EXT_END() }
#define NAZARA_VULKANRENDERER_DEVICE_FUNCTION(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func));
// VK_KHR_display_swapchain
if (IsExtensionLoaded("VK_KHR_display_swapchain"))
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateSharedSwapchainsKHR);
#include <Nazara/VulkanRenderer/Wrapper/DeviceFunctions.hpp>
// VK_KHR_swapchain
if (IsExtensionLoaded("VK_KHR_swapchain"))
{
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkAcquireNextImageKHR);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkCreateSwapchainKHR);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkDestroySwapchainKHR);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkGetSwapchainImagesKHR);
NAZARA_VULKANRENDERER_LOAD_DEVICE(vkQueuePresentKHR);
}
#undef NAZARA_VULKANRENDERER_DEVICE_EXT_BEGIN
#undef NAZARA_VULKANRENDERER_DEVICE_EXT_END
#undef NAZARA_VULKANRENDERER_DEVICE_FUNCTION
}
catch (const std::exception& e)
{
@@ -186,8 +64,6 @@ namespace Nz
return false;
}
#undef NAZARA_VULKANRENDERER_LOAD_DEVICE
// And retains informations about queues
UInt32 maxFamilyIndex = 0;
m_enabledQueuesInfos.resize(createInfo.queueCreateInfoCount);

View File

@@ -35,104 +35,19 @@ namespace Nz
m_loadedLayers.insert(createInfo.ppEnabledLayerNames[i]);
// And now load everything
#define NAZARA_VULKANRENDERER_LOAD_INSTANCE(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func))
try
{
ErrorFlags flags(ErrorFlag_ThrowException, true);
// Vulkan core
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateDevice);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkDestroyInstance);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkEnumeratePhysicalDevices);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetDeviceProcAddr);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceFeatures);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceFormatProperties);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceImageFormatProperties);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceMemoryProperties);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceProperties);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceQueueFamilyProperties);
#define NAZARA_VULKANRENDERER_INSTANCE_EXT_BEGIN(ext) if (IsExtensionLoaded(#ext)) {
#define NAZARA_VULKANRENDERER_INSTANCE_EXT_END() }
#define NAZARA_VULKANRENDERER_INSTANCE_FUNCTION(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func));
// VK_KHR_display
if (IsExtensionLoaded("VK_KHR_display"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateDisplayModeKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateDisplayPlaneSurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetDisplayModePropertiesKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetDisplayPlaneCapabilitiesKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetDisplayPlaneSupportedDisplaysKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceDisplayPlanePropertiesKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceDisplayPropertiesKHR);
}
#include <Nazara/VulkanRenderer/Wrapper/InstanceFunctions.hpp>
// VK_KHR_surface
if (IsExtensionLoaded("VK_KHR_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkDestroySurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceSurfaceFormatsKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceSurfacePresentModesKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceSurfaceSupportKHR);
}
// VK_EXT_debug_report
if (IsExtensionLoaded("VK_EXT_debug_report"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateDebugReportCallbackEXT);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkDestroyDebugReportCallbackEXT);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkDebugReportMessageEXT);
}
#ifdef VK_USE_PLATFORM_ANDROID_KHR
// VK_KHR_android_surface
if (IsExtensionLoaded("VK_KHR_android_surface"))
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateAndroidSurfaceKHR);
#endif
#ifdef VK_USE_PLATFORM_MIR_KHR
// VK_KHR_mir_surface
if (IsExtensionLoaded("VK_KHR_mir_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateMirSurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceMirPresentationSupportKHR);
}
#endif
#ifdef VK_USE_PLATFORM_XCB_KHR
// VK_KHR_xcb_surface
if (IsExtensionLoaded("VK_KHR_xcb_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateXcbSurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceXcbPresentationSupportKHR);
}
#endif
#ifdef VK_USE_PLATFORM_XLIB_KHR
// VK_KHR_xlib_surface
if (IsExtensionLoaded("VK_KHR_xlib_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateXlibSurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceXlibPresentationSupportKHR);
}
#endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
// VK_KHR_wayland_surface
if (IsExtensionLoaded("VK_KHR_wayland_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateWaylandSurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceWaylandPresentationSupportKHR);
}
#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
// VK_KHR_win32_surface
if (IsExtensionLoaded("VK_KHR_win32_surface"))
{
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkCreateWin32SurfaceKHR);
NAZARA_VULKANRENDERER_LOAD_INSTANCE(vkGetPhysicalDeviceWin32PresentationSupportKHR);
}
#endif
#undef NAZARA_VULKANRENDERER_INSTANCE_EXT_BEGIN
#undef NAZARA_VULKANRENDERER_INSTANCE_EXT_END
#undef NAZARA_VULKANRENDERER_INSTANCE_FUNCTION
}
catch (const std::exception& e)
{
@@ -140,8 +55,6 @@ namespace Nz
return false;
}
#undef NAZARA_VULKANRENDERER_LOAD_INSTANCE
return true;
}