From 033c0581853f87f2d89ad2c4a7193ca255a1af2f Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 7 Jul 2016 14:09:16 +0200 Subject: [PATCH] Vulkan/CommandBuffer: Add some rendering wrappers Former-commit-id: 762ac8aba9d0998aa5e44f8df7832258d743a95f [formerly 30a7cabf1689a0ad96cef2c4c6d632c1118bd99c] Former-commit-id: a25c64c88b0812a4f5d6f641ba309a642c3ce2be --- include/Nazara/Vulkan/VkCommandBuffer.hpp | 16 ++++++ include/Nazara/Vulkan/VkCommandBuffer.inl | 66 ++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Vulkan/VkCommandBuffer.hpp b/include/Nazara/Vulkan/VkCommandBuffer.hpp index 9ded0cabd..95381ef58 100644 --- a/include/Nazara/Vulkan/VkCommandBuffer.hpp +++ b/include/Nazara/Vulkan/VkCommandBuffer.hpp @@ -8,6 +8,7 @@ #define NAZARA_VULKAN_VKCOMMANDBUFFER_HPP #include +#include #include #include @@ -31,14 +32,29 @@ namespace Nz inline bool Begin(VkCommandBufferUsageFlags flags, VkRenderPass renderPass, UInt32 subpass, VkFramebuffer framebuffer, bool occlusionQueryEnable, VkQueryControlFlags queryFlags, VkQueryPipelineStatisticFlags pipelineStatistics); inline bool Begin(VkCommandBufferUsageFlags flags, bool occlusionQueryEnable, VkQueryControlFlags queryFlags, VkQueryPipelineStatisticFlags pipelineStatistics); + inline void BeginRenderPass(const VkRenderPassBeginInfo& beginInfo, VkSubpassContents contents = VK_SUBPASS_CONTENTS_INLINE); + + inline void BindPipeline(VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline); + + inline void Draw(UInt32 vertexCount, UInt32 instanceCount = 1, UInt32 firstVertex = 0, UInt32 firstInstance = 0); + inline bool End(); + inline void EndRenderPass(); + inline void Free(); inline void PipelineBarrier(VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, const VkImageMemoryBarrier& imageMemoryBarrier); inline void PipelineBarrier(VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, const VkMemoryBarrier& memoryBarrier, const VkBufferMemoryBarrier& bufferMemoryBarrier, const VkImageMemoryBarrier& imageMemoryBarrier); inline void PipelineBarrier(VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, UInt32 memoryBarrierCount, const VkMemoryBarrier* memoryBarriers, UInt32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* bufferMemoryBarriers, UInt32 imageMemoryBarrierCount, const VkImageMemoryBarrier* imageMemoryBarriers); + inline void SetScissor(const Recti& scissorRegion); + inline void SetScissor(const VkRect2D& scissorRegion); + inline void SetScissor(UInt32 firstScissor, UInt32 scissorCount, const VkRect2D* scissors); + inline void SetViewport(const Rectf& viewport, float minDepth, float maxDepth); + inline void SetViewport(const VkViewport& viewport); + inline void SetViewport(UInt32 firstViewport, UInt32 viewportCount, const VkViewport* viewports); + inline VkResult GetLastErrorCode() const; CommandBuffer& operator=(const CommandBuffer&) = delete; diff --git a/include/Nazara/Vulkan/VkCommandBuffer.inl b/include/Nazara/Vulkan/VkCommandBuffer.inl index b2a2b42e5..682b9884c 100644 --- a/include/Nazara/Vulkan/VkCommandBuffer.inl +++ b/include/Nazara/Vulkan/VkCommandBuffer.inl @@ -123,6 +123,21 @@ namespace Nz return Begin(beginInfo); } + inline void CommandBuffer::BeginRenderPass(const VkRenderPassBeginInfo& beginInfo, VkSubpassContents contents) + { + return m_pool->GetDevice()->vkCmdBeginRenderPass(m_handle, &beginInfo, contents); + } + + inline void CommandBuffer::BindPipeline(VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) + { + return m_pool->GetDevice()->vkCmdBindPipeline(m_handle, pipelineBindPoint, pipeline); + } + + inline void CommandBuffer::Draw(UInt32 vertexCount, UInt32 instanceCount, UInt32 firstVertex, UInt32 firstInstance) + { + return m_pool->GetDevice()->vkCmdDraw(m_handle, vertexCount, instanceCount, firstVertex, firstInstance); + } + inline bool CommandBuffer::End() { m_lastErrorCode = m_pool->GetDevice()->vkEndCommandBuffer(m_handle); @@ -135,6 +150,11 @@ namespace Nz return true; } + inline void CommandBuffer::EndRenderPass() + { + return m_pool->GetDevice()->vkCmdEndRenderPass(m_handle); + } + inline void CommandBuffer::Free() { if (m_handle) @@ -153,7 +173,51 @@ namespace Nz inline void CommandBuffer::PipelineBarrier(VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, UInt32 memoryBarrierCount, const VkMemoryBarrier* memoryBarriers, UInt32 bufferMemoryBarrierCount, const VkBufferMemoryBarrier* bufferMemoryBarriers, UInt32 imageMemoryBarrierCount, const VkImageMemoryBarrier* imageMemoryBarriers) { - m_pool->GetDevice()->vkCmdPipelineBarrier(m_handle, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, memoryBarriers, bufferMemoryBarrierCount, bufferMemoryBarriers, imageMemoryBarrierCount, imageMemoryBarriers); + return m_pool->GetDevice()->vkCmdPipelineBarrier(m_handle, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, memoryBarriers, bufferMemoryBarrierCount, bufferMemoryBarriers, imageMemoryBarrierCount, imageMemoryBarriers); + } + + inline void CommandBuffer::SetScissor(const Recti& scissorRegion) + { + VkRect2D rect = { + {scissorRegion.x, scissorRegion.y}, // VkOffset2D offset + {scissorRegion.width, scissorRegion.height} // VkExtent2D extent + }; + + SetScissor(rect); + } + + inline void CommandBuffer::SetScissor(const VkRect2D& scissorRegion) + { + return SetScissor(0, 1, &scissorRegion); + } + + inline void CommandBuffer::SetScissor(UInt32 firstScissor, UInt32 scissorCount, const VkRect2D* scissors) + { + return m_pool->GetDevice()->vkCmdSetScissor(m_handle, firstScissor, scissorCount, scissors); + } + + inline void CommandBuffer::SetViewport(const Rectf& viewport, float minDepth, float maxDepth) + { + VkViewport rect = { + viewport.x, // float x; + viewport.y, // float y; + viewport.width, // float width; + viewport.height, // float height; + minDepth, // float minDepth; + maxDepth // float maxDepth; + }; + + SetViewport(rect); + } + + inline void CommandBuffer::SetViewport(const VkViewport& viewport) + { + return SetViewport(0, 1, &viewport); + } + + inline void CommandBuffer::SetViewport(UInt32 firstViewport, UInt32 viewportCount, const VkViewport* viewports) + { + return m_pool->GetDevice()->vkCmdSetViewport(m_handle, firstViewport, viewportCount, viewports); } inline VkResult CommandBuffer::GetLastErrorCode() const