diff --git a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp index 4fcd9c3bf..8f19639c5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp @@ -32,6 +32,8 @@ namespace Nz inline bool Present(VkSwapchainKHR swapchain, UInt32 imageIndex, VkSemaphore waitSemaphore = VK_NULL_HANDLE) const; inline bool Submit(VkCommandBuffer commandBuffer, VkSemaphore waitSemaphore, VkPipelineStageFlags waitStage, VkSemaphore signalSemaphore, VkFence signalFence = VK_NULL_HANDLE) const; + inline bool Submit(VkCommandBuffer commandBuffer, std::initializer_list waitSemaphores, VkPipelineStageFlags waitStage, std::initializer_list signalSemaphores, VkFence signalFence = VK_NULL_HANDLE) const; + inline bool Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, std::initializer_list waitSemaphores, VkPipelineStageFlags waitStage, std::initializer_list signalSemaphores, VkFence signalFence = VK_NULL_HANDLE) const; inline bool Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, VkSemaphore waitSemaphore, VkPipelineStageFlags waitStage, VkSemaphore signalSemaphore, VkFence signalFence = VK_NULL_HANDLE) const; inline bool Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, UInt32 waitSemaphoreCount, const VkSemaphore* waitSemaphores, VkPipelineStageFlags waitStage, UInt32 signalSemaphoreCount, const VkSemaphore* signalSemaphores, VkFence signalFence = VK_NULL_HANDLE) const; inline bool Submit(const VkSubmitInfo& submit, VkFence signalFence = VK_NULL_HANDLE) const; diff --git a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.inl b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.inl index c43eb2fe7..96bc080d0 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.inl +++ b/include/Nazara/VulkanRenderer/Wrapper/QueueHandle.inl @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -68,6 +69,34 @@ namespace Nz return Submit(1U, &commandBuffer, waitSemaphore, waitStage, signalSemaphore, signalFence); } + inline bool QueueHandle::Submit(VkCommandBuffer commandBuffer, std::initializer_list waitSemaphores, VkPipelineStageFlags waitStage, std::initializer_list signalSemaphores, VkFence signalFence) const + { + return Submit(1U, &commandBuffer, waitSemaphores, waitStage, signalSemaphores, signalFence); + } + + inline bool QueueHandle::Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, std::initializer_list waitSemaphores, VkPipelineStageFlags waitStage, std::initializer_list signalSemaphores, VkFence signalFence) const + { + // Make continuous array of semaphores (initializer_list doesn't have that guarantee) + StackArray signalSemaphoresCont = NazaraStackArrayNoInit(VkSemaphore, signalSemaphores.size()); + StackArray waitSemaphoresCont = NazaraStackArrayNoInit(VkSemaphore, waitSemaphores.size()); + std::size_t i; + + i = 0; + for (VkSemaphore semaphore : signalSemaphores) + signalSemaphoresCont[i++] = semaphore; + + i = 0; + for (VkSemaphore semaphore : waitSemaphores) + waitSemaphoresCont[i++] = semaphore; + + return Submit(commandBufferCount, commandBuffers, UInt32(waitSemaphoresCont.size()), waitSemaphoresCont.data(), waitStage, UInt32(signalSemaphoresCont.size()), signalSemaphoresCont.data(), signalFence); + } + + inline bool QueueHandle::Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, VkSemaphore waitSemaphore, VkPipelineStageFlags waitStage, VkSemaphore signalSemaphore, VkFence signalFence) const + { + return Submit(commandBufferCount, commandBuffers, (waitSemaphore) ? 1U : 0U, &waitSemaphore, waitStage, (signalSemaphore) ? 1U : 0U, &signalSemaphore, signalFence); + } + inline bool QueueHandle::Submit(UInt32 commandBufferCount, const VkCommandBuffer* commandBuffers, UInt32 waitSemaphoreCount, const VkSemaphore* waitSemaphores, VkPipelineStageFlags waitStage, UInt32 signalSemaphoreCount, const VkSemaphore* signalSemaphores, VkFence signalFence) const { VkSubmitInfo submitInfo = {