Vulkan/Surface: Move all of .cpp code to .inl

There's no point to have .cpp file of this class and others (swapchain,
fence, semaphore, etc.)


Former-commit-id: 82472312ac31bbe60683cf7e3c4b8f40bb5cd984

include/Nazara/Vulkan/VkSurface.hpp

@@ -28,37 +28,37 @@ namespace Nz
 
 				#ifdef VK_USE_PLATFORM_ANDROID_KHR
 				// VK_KHR_android_surface
-				bool Create(const VkAndroidSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkAndroidSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(ANativeWindow* window, VkAndroidSurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
 				#ifdef VK_USE_PLATFORM_MIR_KHR
 				// VK_KHR_mir_surface
-				bool Create(const VkMirSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkMirSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(MirConnection* connection, MirSurface* surface, VkMirSurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
 				#ifdef VK_USE_PLATFORM_XCB_KHR
 				// VK_KHR_xcb_surface
-				bool Create(const VkXcbSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkXcbSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(xcb_connection_t* connection, xcb_window_t window, VkXcbSurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
 				#ifdef VK_USE_PLATFORM_XLIB_KHR
 				// VK_KHR_xlib_surface
-				bool Create(const VkXlibSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkXlibSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(Display* display, Window window, VkXlibSurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
 				#ifdef VK_USE_PLATFORM_WAYLAND_KHR
 				// VK_KHR_wayland_surface
-				bool Create(const VkWaylandSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkWaylandSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(wl_display* display, wl_surface* surface, VkWaylandSurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
 				#ifdef VK_USE_PLATFORM_WIN32_KHR
 				// VK_KHR_win32_surface
-				bool Create(const VkWin32SurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
+				inline bool Create(const VkWin32SurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator = nullptr);
 				inline bool Create(HINSTANCE instance, HWND handle, VkWin32SurfaceCreateFlagsKHR flags = 0, const VkAllocationCallbacks* allocator = nullptr);
 				#endif
 
@@ -72,7 +72,7 @@ namespace Nz
 				Surface& operator=(Surface&&) = delete;
 
 			private:
-				bool Create(const VkAllocationCallbacks* allocator);
+				inline bool Create(const VkAllocationCallbacks* allocator);
 
 				Instance& m_instance;
 				VkAllocationCallbacks m_allocator;

include/Nazara/Vulkan/VkSurface.inl

@@ -23,6 +23,12 @@ namespace Nz
 		}
 
 		#ifdef VK_USE_PLATFORM_ANDROID_KHR
+		inline bool Surface::Create(const VkAndroidSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.PFN_vkCreateAndroidSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(ANativeWindow* window, VkAndroidSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkAndroidSurfaceCreateInfoKHR createInfo = 
@@ -38,6 +44,12 @@ namespace Nz
 		#endif
 
 		#ifdef VK_USE_PLATFORM_MIR_KHR
+		inline bool Surface::Create(const VkMirSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.PFN_vkCreateMirSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(MirConnection* connection, MirSurface* surface, VkMirSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkMirSurfaceCreateInfoKHR createInfo =
@@ -54,6 +66,12 @@ namespace Nz
 		#endif
 
 		#ifdef VK_USE_PLATFORM_XCB_KHR
+		inline bool Surface::Create(const VkXcbSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.PFN_vkCreateXcbSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(xcb_connection_t* connection, xcb_window_t window, VkXcbSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkXcbSurfaceCreateInfoKHR createInfo =
@@ -70,6 +88,12 @@ namespace Nz
 		#endif
 
 		#ifdef VK_USE_PLATFORM_XLIB_KHR
+		inline bool Surface::Create(const VkXlibSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.PFN_vkCreateXlibSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(Display* display, Window window, VkXlibSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkXlibSurfaceCreateInfoKHR createInfo =
@@ -86,6 +110,12 @@ namespace Nz
 		#endif
 
 		#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+		inline bool Surface::Create(const VkWaylandSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.vkCreateWaylandSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(wl_display* display, wl_surface* surface, VkWaylandSurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkWaylandSurfaceCreateInfoKHR createInfo =
@@ -102,6 +132,12 @@ namespace Nz
 		#endif
 
 		#ifdef VK_USE_PLATFORM_WIN32_KHR
+		inline bool Surface::Create(const VkWin32SurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
+		{
+			m_lastErrorCode = m_instance.vkCreateWin32SurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
+			return Create(allocator);
+		}
+
 		inline bool Surface::Create(HINSTANCE instance, HWND handle, VkWin32SurfaceCreateFlagsKHR flags, const VkAllocationCallbacks* allocator)
 		{
 			VkWin32SurfaceCreateInfoKHR createInfo =
@@ -165,6 +201,23 @@ namespace Nz
 
 			return false;
 		}
+
+		inline bool Surface::Create(const VkAllocationCallbacks* allocator)
+		{
+			if (m_lastErrorCode != VkResult::VK_SUCCESS)
+			{
+				NazaraError("Failed to create Vulkan surface");
+				return false;
+			}
+
+			// Store the allocator to access them when needed
+			if (allocator)
+				m_allocator = *allocator;
+			else
+				m_allocator.pfnAllocation = nullptr;
+
+			return true;
+		}
 	}
 }
 

src/Nazara/Vulkan/VkSurface.cpp

@@ -1,78 +0,0 @@
-// 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/VkSurface.hpp>
-#include <Nazara/Core/Error.hpp>
-#include <Nazara/Vulkan/Debug.hpp>
-
-namespace Nz
-{
-	namespace Vk
-	{
-		#ifdef VK_USE_PLATFORM_ANDROID_KHR
-		bool Surface::Create(const VkAndroidSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.PFN_vkCreateAndroidSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		#ifdef VK_USE_PLATFORM_MIR_KHR
-		bool Surface::Create(const VkMirSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.PFN_vkCreateMirSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		#ifdef VK_USE_PLATFORM_XCB_KHR
-		bool Surface::Create(const VkXcbSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.PFN_vkCreateXcbSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		#ifdef VK_USE_PLATFORM_XLIB_KHR
-		bool Surface::Create(const VkXlibSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.PFN_vkCreateXlibSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-		bool Surface::Create(const VkWaylandSurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.vkCreateWaylandSurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		#ifdef VK_USE_PLATFORM_WIN32_KHR
-		bool Surface::Create(const VkWin32SurfaceCreateInfoKHR& createInfo, const VkAllocationCallbacks* allocator)
-		{
-			m_lastErrorCode = m_instance.vkCreateWin32SurfaceKHR(m_instance, &createInfo, allocator, &m_surface);
-			return Create(allocator);
-		}
-		#endif
-
-		bool Surface::Create(const VkAllocationCallbacks* allocator)
-		{
-			if (m_lastErrorCode != VkResult::VK_SUCCESS)
-			{
-				NazaraError("Failed to create Vulkan surface");
-				return false;
-			}
-
-			// Store the allocator to access them when needed
-			if (allocator)
-				m_allocator = *allocator;
-			else
-				m_allocator.pfnAllocation = nullptr;
-
-			return true;
-		}
-	}
-}