From 4a27fa188e49988d2cfe241fa3ca69282bc792a7 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Sun, 2 Feb 2020 22:27:06 -0800
Subject: Fixed UWP build plus bug in Win32NativeWindow ctor

---
 Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp | 2 +-
 Platforms/Win32/interface/Win32NativeWindow.h               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
index 9479d72e..18cb8bf0 100644
--- a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
@@ -194,7 +194,7 @@ protected:
 
         hr = factory->CreateSwapChainForCoreWindow(
             pD3D11DeviceOrD3D12CmdQueue,
-            reinterpret_cast<IUnknown*>(m_Window.pWindow),
+            reinterpret_cast<IUnknown*>(m_Window.pCoreWindow),
             &swapChainDesc,
             nullptr,
             &pSwapChain1);
diff --git a/Platforms/Win32/interface/Win32NativeWindow.h b/Platforms/Win32/interface/Win32NativeWindow.h
index 505b15f0..395e9043 100644
--- a/Platforms/Win32/interface/Win32NativeWindow.h
+++ b/Platforms/Win32/interface/Win32NativeWindow.h
@@ -40,7 +40,7 @@ struct Win32NativeWindow
     {}
 
     explicit Win32NativeWindow(void* _hWnd) noexcept :
-        hWnd{hWnd}
+        hWnd{_hWnd}
     {}
 #endif
 };
-- 
cgit v1.2.3