diff --git a/include/Nazara/Vulkan/VkDevice.hpp b/include/Nazara/Vulkan/VkDevice.hpp index 0df3ec68d..06247ab19 100644 --- a/include/Nazara/Vulkan/VkDevice.hpp +++ b/include/Nazara/Vulkan/VkDevice.hpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace Nz { @@ -34,6 +35,9 @@ namespace Nz inline const Instance& GetInstance() const; inline VkResult GetLastErrorCode() const; + inline bool IsExtensionLoaded(const String& extensionName); + inline bool IsLayerLoaded(const String& layerName); + inline bool WaitForIdle(); Device& operator=(const Device&) = delete; @@ -45,9 +49,116 @@ namespace Nz #define NAZARA_VULKAN_DEVICE_FUNCTION(func) PFN_##func func // Vulkan core + NAZARA_VULKAN_DEVICE_FUNCTION(vkAllocateCommandBuffers); + NAZARA_VULKAN_DEVICE_FUNCTION(vkAllocateMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkBeginCommandBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkBindBufferMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkBindImageMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBeginQuery); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBeginRenderPass); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBindDescriptorSets); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBindIndexBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBindPipeline); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBindVertexBuffers); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdBlitImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdClearAttachments); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdClearColorImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdClearDepthStencilImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdCopyBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdCopyBufferToImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdCopyImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdCopyImageToBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdCopyQueryPoolResults); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDispatch); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDispatchIndirect); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDraw); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDrawIndexed); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDrawIndexedIndirect); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdDrawIndirect); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdEndQuery); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdEndRenderPass); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdExecuteCommands); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdFillBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdNextSubpass); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdPipelineBarrier); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdPushConstants); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdResetEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdResetQueryPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdResolveImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetBlendConstants); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetDepthBias); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetDepthBounds); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetLineWidth); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetScissor); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetStencilCompareMask); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetStencilReference); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetStencilWriteMask); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdSetViewport); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdUpdateBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdWaitEvents); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCmdWriteTimestamp); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateBufferView); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateCommandPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateComputePipelines); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateDescriptorPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateDescriptorSetLayout); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateFramebuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateGraphicsPipelines); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateImageView); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreatePipelineLayout); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateRenderPass); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateSampler); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateSemaphore); + NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateShaderModule); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyBufferView); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyCommandPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyDescriptorPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyDescriptorSetLayout); NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyDevice); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyFramebuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyImage); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyImageView); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyPipeline); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyPipelineLayout); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyRenderPass); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroySampler); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroySemaphore); + NAZARA_VULKAN_DEVICE_FUNCTION(vkDestroyShaderModule); NAZARA_VULKAN_DEVICE_FUNCTION(vkDeviceWaitIdle); + NAZARA_VULKAN_DEVICE_FUNCTION(vkEndCommandBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkFreeCommandBuffers); + NAZARA_VULKAN_DEVICE_FUNCTION(vkFreeDescriptorSets); + NAZARA_VULKAN_DEVICE_FUNCTION(vkFreeMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkFlushMappedMemoryRanges); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetBufferMemoryRequirements); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetDeviceMemoryCommitment); NAZARA_VULKAN_DEVICE_FUNCTION(vkGetDeviceQueue); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetEventStatus); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetFenceStatus); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetImageMemoryRequirements); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetImageSparseMemoryRequirements); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetImageSubresourceLayout); + NAZARA_VULKAN_DEVICE_FUNCTION(vkGetRenderAreaGranularity); + NAZARA_VULKAN_DEVICE_FUNCTION(vkInvalidateMappedMemoryRanges); + NAZARA_VULKAN_DEVICE_FUNCTION(vkMapMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkMergePipelineCaches); + NAZARA_VULKAN_DEVICE_FUNCTION(vkQueueSubmit); + NAZARA_VULKAN_DEVICE_FUNCTION(vkQueueWaitIdle); + NAZARA_VULKAN_DEVICE_FUNCTION(vkResetCommandBuffer); + NAZARA_VULKAN_DEVICE_FUNCTION(vkResetCommandPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkResetDescriptorPool); + NAZARA_VULKAN_DEVICE_FUNCTION(vkResetFences); + NAZARA_VULKAN_DEVICE_FUNCTION(vkResetEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkSetEvent); + NAZARA_VULKAN_DEVICE_FUNCTION(vkUnmapMemory); + NAZARA_VULKAN_DEVICE_FUNCTION(vkUpdateDescriptorSets); + NAZARA_VULKAN_DEVICE_FUNCTION(vkWaitForFences); // VK_KHR_display_swapchain NAZARA_VULKAN_DEVICE_FUNCTION(vkCreateSharedSwapchainsKHR); @@ -75,6 +186,8 @@ namespace Nz VkAllocationCallbacks m_allocator; VkDevice m_device; VkResult m_lastErrorCode; + std::unordered_set m_loadedExtensions; + std::unordered_set m_loadedLayers; }; } } diff --git a/include/Nazara/Vulkan/VkDevice.inl b/include/Nazara/Vulkan/VkDevice.inl index 4eddb4abf..e837f67f6 100644 --- a/include/Nazara/Vulkan/VkDevice.inl +++ b/include/Nazara/Vulkan/VkDevice.inl @@ -51,6 +51,16 @@ namespace Nz return m_lastErrorCode; } + inline bool Device::IsExtensionLoaded(const String& extensionName) + { + return m_loadedExtensions.count(extensionName) > 0; + } + + inline bool Device::IsLayerLoaded(const String& layerName) + { + return m_loadedLayers.count(layerName) > 0; + } + inline bool Device::WaitForIdle() { m_lastErrorCode = vkDeviceWaitIdle(m_device); diff --git a/src/Nazara/Vulkan/VkDevice.cpp b/src/Nazara/Vulkan/VkDevice.cpp index 1c3eafa3c..c2f39da76 100644 --- a/src/Nazara/Vulkan/VkDevice.cpp +++ b/src/Nazara/Vulkan/VkDevice.cpp @@ -26,22 +26,136 @@ namespace Nz else m_allocator.pfnAllocation = nullptr; + // Parse extensions and layers + for (UInt32 i = 0; i < createInfo.enabledExtensionCount; ++i) + m_loadedExtensions.insert(createInfo.ppEnabledExtensionNames[i]); + + for (UInt32 i = 0; i < createInfo.enabledLayerCount; ++i) + m_loadedLayers.insert(createInfo.ppEnabledLayerNames[i]); + #define NAZARA_VULKAN_LOAD_DEVICE(func) func = reinterpret_cast(GetProcAddr(#func)) try { ErrorFlags flags(ErrorFlag_ThrowException, true); + NAZARA_VULKAN_LOAD_DEVICE(vkAllocateCommandBuffers); + NAZARA_VULKAN_LOAD_DEVICE(vkAllocateMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkBeginCommandBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkBindBufferMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkBindImageMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBeginQuery); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBeginRenderPass); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBindDescriptorSets); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBindIndexBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBindPipeline); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBindVertexBuffers); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdBlitImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdClearAttachments); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdClearColorImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdClearDepthStencilImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdCopyBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdCopyBufferToImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdCopyImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdCopyImageToBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdCopyQueryPoolResults); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDispatch); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDispatchIndirect); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDraw); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDrawIndexed); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDrawIndexedIndirect); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdDrawIndirect); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdEndQuery); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdEndRenderPass); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdExecuteCommands); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdFillBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdNextSubpass); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdPipelineBarrier); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdPushConstants); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdResetEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdResetQueryPool); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdResolveImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetBlendConstants); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetDepthBias); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetDepthBounds); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetLineWidth); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetScissor); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetStencilCompareMask); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetStencilReference); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetStencilWriteMask); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdSetViewport); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdUpdateBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdWaitEvents); + NAZARA_VULKAN_LOAD_DEVICE(vkCmdWriteTimestamp); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateBufferView); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateCommandPool); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateComputePipelines); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateDescriptorPool); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateDescriptorSetLayout); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateFramebuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateGraphicsPipelines); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateImage); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateImageView); + NAZARA_VULKAN_LOAD_DEVICE(vkCreatePipelineLayout); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateRenderPass); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateSampler); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateSemaphore); + NAZARA_VULKAN_LOAD_DEVICE(vkCreateShaderModule); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyBufferView); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyCommandPool); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyDescriptorPool); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyDescriptorSetLayout); NAZARA_VULKAN_LOAD_DEVICE(vkDestroyDevice); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyFramebuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyImage); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyImageView); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyPipeline); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyPipelineLayout); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyRenderPass); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroySampler); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroySemaphore); + NAZARA_VULKAN_LOAD_DEVICE(vkDestroyShaderModule); NAZARA_VULKAN_LOAD_DEVICE(vkDeviceWaitIdle); + NAZARA_VULKAN_LOAD_DEVICE(vkEndCommandBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkFreeCommandBuffers); + NAZARA_VULKAN_LOAD_DEVICE(vkFreeDescriptorSets); + NAZARA_VULKAN_LOAD_DEVICE(vkFreeMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkFlushMappedMemoryRanges); + NAZARA_VULKAN_LOAD_DEVICE(vkGetBufferMemoryRequirements); + NAZARA_VULKAN_LOAD_DEVICE(vkGetDeviceMemoryCommitment); NAZARA_VULKAN_LOAD_DEVICE(vkGetDeviceQueue); + NAZARA_VULKAN_LOAD_DEVICE(vkGetEventStatus); + NAZARA_VULKAN_LOAD_DEVICE(vkGetFenceStatus); + NAZARA_VULKAN_LOAD_DEVICE(vkGetImageMemoryRequirements); + NAZARA_VULKAN_LOAD_DEVICE(vkGetImageSparseMemoryRequirements); + NAZARA_VULKAN_LOAD_DEVICE(vkGetImageSubresourceLayout); + NAZARA_VULKAN_LOAD_DEVICE(vkGetRenderAreaGranularity); + NAZARA_VULKAN_LOAD_DEVICE(vkInvalidateMappedMemoryRanges); + NAZARA_VULKAN_LOAD_DEVICE(vkMapMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkMergePipelineCaches); + NAZARA_VULKAN_LOAD_DEVICE(vkQueueSubmit); + NAZARA_VULKAN_LOAD_DEVICE(vkQueueWaitIdle); + NAZARA_VULKAN_LOAD_DEVICE(vkResetCommandBuffer); + NAZARA_VULKAN_LOAD_DEVICE(vkResetCommandPool); + NAZARA_VULKAN_LOAD_DEVICE(vkResetDescriptorPool); + NAZARA_VULKAN_LOAD_DEVICE(vkResetFences); + NAZARA_VULKAN_LOAD_DEVICE(vkResetEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkSetEvent); + NAZARA_VULKAN_LOAD_DEVICE(vkUnmapMemory); + NAZARA_VULKAN_LOAD_DEVICE(vkUpdateDescriptorSets); + NAZARA_VULKAN_LOAD_DEVICE(vkWaitForFences); // VK_KHR_display_swapchain - if (m_instance.IsExtensionLoaded("VK_KHR_display_swapchain")) + if (IsExtensionLoaded("VK_KHR_display_swapchain")) NAZARA_VULKAN_LOAD_DEVICE(vkCreateSharedSwapchainsKHR); // VK_KHR_swapchain - if (m_instance.IsExtensionLoaded("VK_KHR_swapchain")) + if (IsExtensionLoaded("VK_KHR_swapchain")) { NAZARA_VULKAN_LOAD_DEVICE(vkAcquireNextImageKHR); NAZARA_VULKAN_LOAD_DEVICE(vkCreateSwapchainKHR);