From 7ea0b223ecea01a6dc614c14b170732d3348dbcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= <lynix680@gmail.com>
Date: Tue, 1 Sep 2020 19:18:27 +0200
Subject: [PATCH] Linux fixes

---
 .../Nazara/VulkanRenderer/VkRenderTarget.hpp  |  2 +-
 .../Nazara/VulkanRenderer/Wrapper/Loader.hpp  |  1 +
 src/Nazara/VulkanRenderer/VulkanSurface.cpp   | 29 +++++++++++++++++++
 tests/Engine/Core/Bitset.cpp                  |  1 -
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
index 81b480cf0..f4979b23b 100644
--- a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
+++ b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequisites.hpp>
 #include <Nazara/Core/Signal.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
-#include <Nazara/VulkanRenderer/Wrapper/FrameBuffer.hpp>
+#include <Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
 #include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
 #include <unordered_map>
diff --git a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
index 5a0e77e45..63ae252c3 100644
--- a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
+++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
@@ -11,6 +11,7 @@
 #include <Nazara/Core/DynLib.hpp>
 #include <Nazara/VulkanRenderer/Config.hpp>
 #include <vulkan/vulkan.h>
+#include <vector>
 
 namespace Nz
 {
diff --git a/src/Nazara/VulkanRenderer/VulkanSurface.cpp b/src/Nazara/VulkanRenderer/VulkanSurface.cpp
index a114b12ca..cf0000b4c 100644
--- a/src/Nazara/VulkanRenderer/VulkanSurface.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanSurface.cpp
@@ -25,6 +25,35 @@ namespace Nz
 
 			success = m_surface.Create(instance, winHandle);
 		}
+		#elif defined(NAZARA_PLATFORM_LINUX)
+		{
+			switch (handle.type)
+			{
+				case WindowManager::Wayland:
+				{
+					wl_display* display = static_cast<wl_display*>(handle.wayland.display);
+					wl_surface* surface = static_cast<wl_surface*>(handle.wayland.surface);
+
+					success = m_surface.Create(display, surface);
+					break;
+				}
+
+				case WindowManager::X11:
+				{
+					Display* display = static_cast<Display*>(handle.x11.display);
+					::Window window = static_cast<::Window>(handle.x11.window);
+
+					success = m_surface.Create(display, window);
+					break;
+				}
+
+				default:
+				{
+					NazaraError("unexpected window type");
+					return false;
+				}
+			}
+		}
 		#else
 		#error This OS is not supported by Vulkan
 		#endif
diff --git a/tests/Engine/Core/Bitset.cpp b/tests/Engine/Core/Bitset.cpp
index ed55392e1..d37e8733b 100644
--- a/tests/Engine/Core/Bitset.cpp
+++ b/tests/Engine/Core/Bitset.cpp
@@ -48,7 +48,6 @@ void CheckAppend(const char* title)
 			#define BitVal3 01000010
 			std::array<Nz::UInt8, 3> data = {{NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}};
 			const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1);
-			std::size_t resultLength = Nz::CountOf(result) - 1;
 			std::size_t bitCount = data.size() * 8;
 			#undef BitVal1
 			#undef BitVal2