summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-02-03 06:27:06 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-02-03 06:27:06 +0000
commit4a27fa188e49988d2cfe241fa3ca69282bc792a7 (patch)
treeb78a1aee6ee7156f854efd8337ab58c73d69b6fe
parentFixed Linux build issue (diff)
downloadDiligentCore-4a27fa188e49988d2cfe241fa3ca69282bc792a7.tar.gz
DiligentCore-4a27fa188e49988d2cfe241fa3ca69282bc792a7.zip
Fixed UWP build plus bug in Win32NativeWindow ctor
-rw-r--r--Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp2
-rw-r--r--Platforms/Win32/interface/Win32NativeWindow.h2
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
};