diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-08-05 05:58:45 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-08-05 05:58:45 +0000 |
| commit | 2f7704623cc3c0bedb8ab9f527cbc03b081998e7 (patch) | |
| tree | c7b95ec4d7c106a3455af05946c7cd0b74f29641 /Graphics/GraphicsEngineD3D11 | |
| parent | Added more renderpass-related checks (diff) | |
| parent | Fixed IDXGISwapChain2 issue on Windows 7 (closed https://github.com/DiligentG... (diff) | |
| download | DiligentCore-2f7704623cc3c0bedb8ab9f527cbc03b081998e7.tar.gz DiligentCore-2f7704623cc3c0bedb8ab9f527cbc03b081998e7.zip | |
Merge branch 'master'
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp index 0c36c5d3..209d5d4c 100644 --- a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp @@ -37,10 +37,10 @@ namespace Diligent { /// Swap chain implementation in Direct3D11 backend. -class SwapChainD3D11Impl final : public SwapChainD3DBase<ISwapChainD3D11, IDXGISwapChain2> +class SwapChainD3D11Impl final : public SwapChainD3DBase<ISwapChainD3D11, IDXGISwapChain> { public: - using TSwapChainBase = SwapChainD3DBase<ISwapChainD3D11, IDXGISwapChain2>; + using TSwapChainBase = SwapChainD3DBase<ISwapChainD3D11, IDXGISwapChain>; SwapChainD3D11Impl(IReferenceCounters* pRefCounters, const SwapChainDesc& SCDesc, diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp index d413ac5f..c8c26d80 100644 --- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp @@ -59,7 +59,7 @@ static CComPtr<IDXGIAdapter1> DXGIAdapterFromD3D11Device(ID3D11Device* pd3d11Dev if (SUCCEEDED(hr)) { CComPtr<IDXGIAdapter1> pDXGIAdapter1; - pDXGIAdapter->QueryInterface(__uuidof(pDXGIAdapter1), reinterpret_cast<void**>(static_cast<IDXGIAdapter1**>(&pDXGIAdapter1))); + pDXGIAdapter.QueryInterface(&pDXGIAdapter1); return pDXGIAdapter1; } else |