Vulkan: Wrap vulkan queues

Former-commit-id: 9fff47e3efbb8ce7b2c70be9a468627b7e8a1340

include/Nazara/Vulkan/VkDevice.hpp

@@ -19,6 +19,7 @@ namespace Nz
 	namespace Vk
 	{
 		class Device;
+		class Queue;
 		class Instance;
 
 		using DeviceHandle = ObjectHandle<Device>;
@@ -34,7 +35,7 @@ namespace Nz
 				bool Create(VkPhysicalDevice device, const VkDeviceCreateInfo& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline void Destroy();
 
-				inline VkQueue GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex);
+				inline Queue GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex);
 				inline Instance& GetInstance();
 				inline const Instance& GetInstance() const;
 				inline VkResult GetLastErrorCode() const;

include/Nazara/Vulkan/VkDevice.inl

@@ -5,6 +5,7 @@
 #include <Nazara/Vulkan/VkDevice.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Vulkan/VkInstance.hpp>
+#include <Nazara/Vulkan/VkQueue.hpp>
 #include <Nazara/Vulkan/Debug.hpp>
 
 namespace Nz
@@ -31,12 +32,12 @@ namespace Nz
 			}
 		}
 
-		inline VkQueue Device::GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex)
+		inline Queue Device::GetQueue(UInt32 queueFamilyIndex, UInt32 queueIndex)
 		{
 			VkQueue queue;
 			vkGetDeviceQueue(m_device, queueFamilyIndex, queueIndex, &queue);
 			
-			return queue;
+			return Queue(*this, queue);
 		}
 
 		inline Instance& Device::GetInstance()

include/Nazara/Vulkan/VkQueue.hpp

@@ -0,0 +1,52 @@
+// Copyright (C) 2016 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Vulkan"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#pragma once
+
+#ifndef NAZARA_VULKAN_VKQUEUE_HPP
+#define NAZARA_VULKAN_VKQUEUE_HPP
+
+#include <Nazara/Prerequesites.hpp>
+#include <Nazara/Vulkan/VkDevice.hpp>
+#include <vulkan/vulkan.h>
+
+namespace Nz 
+{
+	namespace Vk
+	{
+		class Queue
+		{
+			public:
+				inline Queue(Device& device, VkQueue queue);
+				inline Queue(const Queue& queue);
+				inline Queue(Queue&& queue);
+				inline ~Queue() = default;
+
+				inline Device& GetDevice();
+				inline VkResult GetLastErrorCode() const;
+
+				inline bool Present(const VkPresentInfoKHR& presentInfo);
+				inline bool Present(VkSwapchainKHR swapchain, UInt32 imageIndex, VkSemaphore waitSemaphore = VK_NULL_HANDLE);
+
+				inline bool Submit(const VkSubmitInfo& submit, VkFence fence = VK_NULL_HANDLE);
+				inline bool Submit(UInt32 submitCount, const VkSubmitInfo* submits, VkFence fence = VK_NULL_HANDLE);
+
+				inline bool WaitIdle();
+
+				Queue& operator=(const Queue& queue) = delete;
+				Queue& operator=(Queue&&) = delete;
+
+				inline operator VkQueue();
+
+			protected:
+				Device& m_device;
+				VkQueue m_handle;
+				VkResult m_lastErrorCode;
+		};
+	}
+}
+
+#include <Nazara/Vulkan/VkQueue.inl>
+
+#endif // NAZARA_VULKAN_VKQUEUE_HPP

include/Nazara/Vulkan/VkQueue.inl

@@ -0,0 +1,102 @@
+// Copyright (C) 2016 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Vulkan"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Vulkan/VkCommandPool.hpp>
+#include <Nazara/Core/Error.hpp>
+#include <Nazara/Vulkan/VkDevice.hpp>
+#include <Nazara/Vulkan/Debug.hpp>
+
+namespace Nz
+{
+	namespace Vk
+	{
+		inline Queue::Queue(Device& device, VkQueue queue) :
+		m_device(device),
+		m_handle(queue),
+		m_lastErrorCode(VkResult::VK_SUCCESS)
+		{
+		}
+
+		inline Queue::Queue(const Queue& queue) :
+		m_device(queue.m_device),
+		m_handle(queue.m_handle),
+		m_lastErrorCode(queue.m_lastErrorCode)
+		{
+		}
+		
+		inline Queue::Queue(Queue&& queue) :
+		m_device(queue.m_device),
+		m_handle(queue.m_handle),
+		m_lastErrorCode(queue.m_lastErrorCode)
+		{
+		}
+
+		inline Device& Queue::GetDevice()
+		{
+			return m_device;
+		}
+
+		inline VkResult Queue::GetLastErrorCode() const
+		{
+			return m_lastErrorCode;
+		}
+
+		inline bool Queue::Present(const VkPresentInfoKHR& presentInfo)
+		{
+			m_lastErrorCode = m_device.vkQueuePresentKHR(m_handle, &presentInfo);
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+				return false;
+
+			return true;
+		}
+
+		inline bool Queue::Present(VkSwapchainKHR swapchain, UInt32 imageIndex, VkSemaphore waitSemaphore)
+		{
+			VkPresentInfoKHR presentInfo =
+			{
+				VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
+				nullptr,
+				(waitSemaphore) ? 1U : 0U,
+				&waitSemaphore,
+				1U,
+				&swapchain,
+				&imageIndex,
+				nullptr
+			};
+
+			return Present(presentInfo);
+		}
+
+		inline bool Queue::Submit(const VkSubmitInfo& submit, VkFence fence)
+		{
+			return Submit(1, &submit, fence);
+		}
+
+		inline bool Queue::Submit(UInt32 submitCount, const VkSubmitInfo* submits, VkFence fence)
+		{
+			m_lastErrorCode = m_device.vkQueueSubmit(m_handle, submitCount, submits, fence);
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+				return false;
+
+			return true;
+		}
+
+		inline bool Queue::WaitIdle()
+		{
+			m_lastErrorCode = m_device.vkQueueWaitIdle(m_handle);
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+				return false;
+
+			return true;
+		}
+
+		inline Queue::operator VkQueue()
+		{
+			return m_handle;
+		}
+
+	}
+}
+
+#include <Nazara/Vulkan/DebugOff.hpp>