backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxgi,d3d11] Move swap chain creation to D3D11 module

Browse Source
This commit is contained in:
Philip Rebohle 2019-02-11 19:48:47 +01:00
parent 7ed91872b6
commit 9f8c1d08a6
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 39 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/d3d11/d3d11_device.cpp
View File

@ -1,6 +1,7 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include "../dxgi/dxgi_monitor.h"
#include "../dxgi/dxgi_swapchain.h" #include "../dxgi/dxgi_swapchain.h"
#include "../dxvk/dxvk_adapter.h" #include "../dxvk/dxvk_adapter.h"
@ -1720,10 +1721,44 @@ namespace dxvk {
if (!ppSwapChain || !pDesc || !hWnd) if (!ppSwapChain || !pDesc || !hWnd)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
return CreateDxvkSwapChainForHwnd( // Make sure the back buffer size is not zero
pFactory, m_device, hWnd, pDesc, DXGI_SWAP_CHAIN_DESC1 desc = *pDesc;
pFullscreenDesc, pRestrictToOutput,
ppSwapChain); GetWindowClientSize(hWnd,
desc.Width ? nullptr : &desc.Width,
desc.Height ? nullptr : &desc.Height);
// If necessary, set up a default set of
// fullscreen parameters for the swap chain
DXGI_SWAP_CHAIN_FULLSCREEN_DESC fsDesc;
if (pFullscreenDesc) {
fsDesc = *pFullscreenDesc;
} else {
fsDesc.RefreshRate = { 0, 0 };
fsDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
fsDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
fsDesc.Windowed = TRUE;
}
// Create presenter for the device
Com<IDXGIVkSwapChain> presenter;
HRESULT hr = m_device->CreateSwapChainForHwnd(
hWnd, &desc, &presenter);
if (FAILED(hr))
return hr;
try {
// Create actual swap chain object
*ppSwapChain = ref(new DxgiSwapChain(
pFactory, presenter.ptr(), hWnd, &desc, &fsDesc));
return S_OK;
} catch (const DxvkError& e) {
Logger::err(e.message());
return DXGI_ERROR_UNSUPPORTED;
}
} }

49
src/dxgi/dxgi_swapchain.cpp
View File

@ -688,53 +688,4 @@ namespace dxvk {
return DXGI_ERROR_NOT_FOUND; return DXGI_ERROR_NOT_FOUND;
} }
HRESULT CreateDxvkSwapChainForHwnd(
IDXGIFactory* pFactory,
IDXGIVkPresentDevice* pDevice,
HWND hWnd,
const DXGI_SWAP_CHAIN_DESC1* pDesc,
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc,
IDXGIOutput* pRestrictToOutput,
IDXGISwapChain1** ppSwapChain) {
// Make sure the back buffer size is not zero
DXGI_SWAP_CHAIN_DESC1 desc = *pDesc;
GetWindowClientSize(hWnd,
desc.Width ? nullptr : &desc.Width,
desc.Height ? nullptr : &desc.Height);
// If necessary, set up a default set of
// fullscreen parameters for the swap chain
DXGI_SWAP_CHAIN_FULLSCREEN_DESC fsDesc;
if (pFullscreenDesc) {
fsDesc = *pFullscreenDesc;
} else {
fsDesc.RefreshRate = { 0, 0 };
fsDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
fsDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
fsDesc.Windowed = TRUE;
}
// Create presenter for the device
Com<IDXGIVkSwapChain> presenter;
HRESULT hr = pDevice->CreateSwapChainForHwnd(
hWnd, &desc, &presenter);
if (FAILED(hr))
return hr;
try {
// Create actual swap chain object
*ppSwapChain = ref(new DxgiSwapChain(
pFactory, presenter.ptr(), hWnd, &desc, &fsDesc));
return S_OK;
} catch (const DxvkError& e) {
Logger::err(e.message());
return DXGI_ERROR_UNSUPPORTED;
}
}
} }

10
src/dxgi/dxgi_swapchain.h
View File

@ -205,14 +205,4 @@ namespace dxvk {
}; };
HRESULT CreateDxvkSwapChainForHwnd(
IDXGIFactory* pFactory,
IDXGIVkPresentDevice* pDevice,
HWND hWnd,
const DXGI_SWAP_CHAIN_DESC1* pDesc,
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc,
IDXGIOutput* pRestrictToOutput,
IDXGISwapChain1** ppSwapChain);
} }