rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-11 10:24:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/doitsujin/dxvk

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-27 02:02:50 +02:00
commit 057d74e57f
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dxgi/dxgi_factory.cpp
View File

@ -52,6 +52,8 @@ namespace dxvk {
IDXGISwapChain** ppSwapChain) { IDXGISwapChain** ppSwapChain) {
if (ppSwapChain == nullptr || pDesc == nullptr || pDevice == NULL) if (ppSwapChain == nullptr || pDesc == nullptr || pDevice == NULL)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
if (pDesc->OutputWindow == nullptr)
return DXGI_ERROR_INVALID_CALL;
try { try {
*ppSwapChain = ref(new DxgiSwapChain(this, pDevice, pDesc)); *ppSwapChain = ref(new DxgiSwapChain(this, pDevice, pDesc));

4
src/dxgi/dxgi_main.cpp
View File

@ -9,7 +9,9 @@ namespace dxvk {
if (riid != __uuidof(IDXGIFactory) if (riid != __uuidof(IDXGIFactory)
&& riid != __uuidof(IDXGIFactory1)) { && riid != __uuidof(IDXGIFactory1)) {
Logger::err("CreateDXGIFactory: Requested version of IDXGIFactory not supported"); Logger::err("CreateDXGIFactory: Requested version of IDXGIFactory not supported");
return DXGI_ERROR_UNSUPPORTED; Logger::err(str::format(riid));
*ppFactory = nullptr;
return E_NOINTERFACE;
} }
try { try {

7
src/dxgi/dxgi_swapchain.cpp
View File

@ -139,8 +139,11 @@ namespace dxvk {
if (pFullscreen != nullptr) if (pFullscreen != nullptr)
*pFullscreen = !m_desc.Windowed; *pFullscreen = !m_desc.Windowed;
if ((ppTarget != nullptr) && !m_desc.Windowed) if (ppTarget != nullptr) {
hr = this->GetContainingOutput(ppTarget); *ppTarget = nullptr;
if (!m_desc.Windowed)
hr = this->GetContainingOutput(ppTarget);
}
return hr; return hr;
} }