mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dxgi] Query device interface from the presenter 

Removes the coupling between IDXGISwapChain and IDXGIDevice.
This is necessary because D3D12 devices don't support IDXGIDevice.
This commit is contained in:
Philip Rebohle 2018-10-24 15:52:09 +02:00
parent 7b9726fd93
commit 589229f4ca
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/d3d11/d3d11_swapchain.cpp
View File

@ -73,6 +73,13 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE D3D11SwapChain::GetDevice(
REFIID riid,
void** ppDevice) {
return m_parent->QueryInterface(riid, ppDevice);
}
HRESULT STDMETHODCALLTYPE D3D11SwapChain::GetImage(
UINT BufferId,
REFIID riid,

4
src/d3d11/d3d11_swapchain.h
View File

@ -40,6 +40,10 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_SWAP_CHAIN_DESC1* pDesc);
HRESULT STDMETHODCALLTYPE GetDevice(
REFIID riid,
void** ppDevice);
HRESULT STDMETHODCALLTYPE GetImage(
UINT BufferId,
REFIID riid,

4
src/dxgi/dxgi_interfaces.h
View File

@ -29,6 +29,10 @@ IDXGIVkSwapChain : public IUnknown {
virtual HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_SWAP_CHAIN_DESC1* pDesc) = 0;
virtual HRESULT STDMETHODCALLTYPE GetDevice(
REFIID riid,
void** ppDevice) = 0;
virtual HRESULT STDMETHODCALLTYPE GetImage(
UINT BufferId,

3
src/dxgi/dxgi_swapchain.cpp
View File

@ -35,7 +35,6 @@ namespace dxvk {
if (FAILED(device->GetAdapter(&adapter)))
throw DxvkError("DXGI: DxgiSwapChain: Failed to retrieve adapter");
m_device = static_cast<DxgiDevice*>(device.ptr());
m_adapter = static_cast<DxgiAdapter*>(adapter.ptr());
// Initialize frame statistics
@ -93,7 +92,7 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE DxgiSwapChain::GetDevice(REFIID riid, void** ppDevice) {
return m_device->QueryInterface(riid, ppDevice);
return m_presenter->GetDevice(riid, ppDevice);
}

1
src/dxgi/dxgi_swapchain.h
View File

@ -136,7 +136,6 @@ namespace dxvk {
Com<DxgiFactory> m_factory;
Com<DxgiAdapter> m_adapter;
Com<DxgiDevice> m_device;
HWND m_window;
DXGI_SWAP_CHAIN_DESC1 m_desc;