Merge fixes

2020-05-27 20:03:46 +02:00
parent 68208f5426
commit e0e7435c55
11 changed files with 48 additions and 40 deletions
--- a/src/Nazara/VulkanRenderer/VulkanSurface.cpp
+++ b/src/Nazara/VulkanRenderer/VulkanSurface.cpp
@@ -18,7 +18,9 @@ namespace Nz
 		bool success = false;
 		#if defined(NAZARA_PLATFORM_WINDOWS)
 		{
-			HWND winHandle = reinterpret_cast<HWND>(handle);
+			NazaraAssert(handle.type == WindowManager::Windows, "expected Windows window");
+
+			HWND winHandle = reinterpret_cast<HWND>(handle.windows.window);
 			HINSTANCE instance = reinterpret_cast<HINSTANCE>(GetWindowLongPtrW(winHandle, GWLP_HINSTANCE));

 			success = m_surface.Create(instance, winHandle);