From 9c08208de3c998cc864117fcec08cafcedcbcc5a Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 19 May 2016 18:34:03 +0200
Subject: [PATCH] Vulkan/CommandBuffer: Add Begin/End overloads

Former-commit-id: c2681cf86c04cfba835204e87b386f3527f689c4
---
 include/Nazara/Vulkan/VkCommandBuffer.hpp | 10 ++-
 include/Nazara/Vulkan/VkCommandBuffer.inl | 98 +++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/include/Nazara/Vulkan/VkCommandBuffer.hpp b/include/Nazara/Vulkan/VkCommandBuffer.hpp
index 0399d4cf7..2dea341dd 100644
--- a/include/Nazara/Vulkan/VkCommandBuffer.hpp
+++ b/include/Nazara/Vulkan/VkCommandBuffer.hpp
@@ -23,7 +23,15 @@ namespace Nz
 				CommandBuffer(const CommandBuffer&) = delete;
 				CommandBuffer(CommandBuffer&& commandBuffer);
 				inline ~CommandBuffer();
-				
+
+				inline bool Begin(const VkCommandBufferBeginInfo& info);
+				inline bool Begin(VkCommandBufferUsageFlags flags);
+				inline bool Begin(VkCommandBufferUsageFlags flags, const VkCommandBufferInheritanceInfo& inheritanceInfo);
+				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 bool End();
+
 				inline void Free();
 
 				inline VkResult GetLastErrorCode() const;
diff --git a/include/Nazara/Vulkan/VkCommandBuffer.inl b/include/Nazara/Vulkan/VkCommandBuffer.inl
index 7e48901c2..d9944e33b 100644
--- a/include/Nazara/Vulkan/VkCommandBuffer.inl
+++ b/include/Nazara/Vulkan/VkCommandBuffer.inl
@@ -31,6 +31,104 @@ namespace Nz
 			Free();
 		}
 
+		inline bool CommandBuffer::Begin(const VkCommandBufferBeginInfo& info)
+		{
+			m_lastErrorCode = m_pool->GetDevice().vkBeginCommandBuffer(m_handle, &info);
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+			{
+				NazaraError("Failed to begin command buffer");
+				return false;
+			}
+
+			return true;
+		}
+
+		inline bool CommandBuffer::Begin(VkCommandBufferUsageFlags flags)
+		{
+			VkCommandBufferBeginInfo beginInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+				nullptr,
+				flags,
+				nullptr
+			};
+
+			return Begin(beginInfo);
+		}
+
+		inline bool CommandBuffer::Begin(VkCommandBufferUsageFlags flags, const VkCommandBufferInheritanceInfo& inheritanceInfo)
+		{
+			VkCommandBufferBeginInfo beginInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+				nullptr,
+				flags,
+				&inheritanceInfo
+			};
+
+			return Begin(beginInfo);
+		}
+
+		inline bool CommandBuffer::Begin(VkCommandBufferUsageFlags flags, VkRenderPass renderPass, UInt32 subpass, VkFramebuffer framebuffer, bool occlusionQueryEnable, VkQueryControlFlags queryFlags, VkQueryPipelineStatisticFlags pipelineStatistics)
+		{
+			NazaraAssert(flags & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, "Continue bit is required to ignore renderPass, subpass and framebuffer");
+
+			VkCommandBufferInheritanceInfo inheritanceInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
+				nullptr,
+				renderPass,
+				subpass,
+				framebuffer,
+				(occlusionQueryEnable) ? VK_TRUE : VK_FALSE,
+				queryFlags,
+				pipelineStatistics
+			};
+
+			VkCommandBufferBeginInfo beginInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+				nullptr,
+				flags,
+				&inheritanceInfo
+			};
+
+			return Begin(beginInfo);
+		}
+
+		inline bool CommandBuffer::Begin(VkCommandBufferUsageFlags flags, bool occlusionQueryEnable, VkQueryControlFlags queryFlags, VkQueryPipelineStatisticFlags pipelineStatistics)
+		{
+			NazaraAssert(flags & VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, "Continue bit is required to ignore renderPass, subpass and framebuffer");
+
+			VkCommandBufferInheritanceInfo inheritanceInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO,
+				nullptr,
+				VK_NULL_HANDLE,
+				0,
+				VK_NULL_HANDLE,
+				(occlusionQueryEnable) ? VK_TRUE : VK_FALSE,
+				queryFlags,
+				pipelineStatistics
+			};
+
+			VkCommandBufferBeginInfo beginInfo = {
+				VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
+				nullptr,
+				flags,
+				&inheritanceInfo
+			};
+
+			return Begin(beginInfo);
+		}
+
+		inline bool CommandBuffer::End()
+		{
+			m_lastErrorCode = m_pool->GetDevice().vkEndCommandBuffer(m_handle);
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+			{
+				NazaraError("Failed to end command buffer");
+				return false;
+			}
+
+			return true;
+		}
+
 		inline void CommandBuffer::Free()
 		{
 			if (m_handle)