rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-19 05:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[dxgi] Fix GetContainingOutput and GetFullscreenState output pointer

Browse Source 
We're supposed to keep a reference to the output around and return
that for fullscreen swap chains. Fixes various wine test failures.
This commit is contained in:
Philip Rebohle 2019-10-01 23:34:11 +02:00
parent 8d8f4b9200
commit 60ff2b8977
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dxgi/dxgi_swapchain.cpp
View File

@ -100,6 +100,11 @@ namespace dxvk {
if (!IsWindow(m_window))
return DXGI_ERROR_INVALID_CALL;
if (m_target != nullptr) {
*ppOutput = m_target.ref();
return S_OK;
}
RECT windowRect = { 0, 0, 0, 0 };
::GetWindowRect(m_window, &windowRect);
@ -185,12 +190,8 @@ namespace dxvk {
if (pFullscreen != nullptr)
*pFullscreen = !m_descFs.Windowed;
if (ppTarget != nullptr) {
*ppTarget = nullptr;
if (!m_descFs.Windowed)
hr = GetOutputFromMonitor(m_monitor, ppTarget);
}
if (ppTarget != nullptr)
*ppTarget = m_target.ref();
return hr;
}
@ -532,7 +533,7 @@ namespace dxvk {
HRESULT DxgiSwapChain::EnterFullscreenMode(IDXGIOutput* pTarget) {
Com<IDXGIOutput> output = static_cast<DxgiOutput*>(pTarget);
Com<IDXGIOutput> output = pTarget;
if (!IsWindow(m_window))
return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE;
@ -591,6 +592,7 @@ namespace dxvk {
SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE);
m_monitor = desc.Monitor;
m_target = std::move(output);
// Apply current gamma curve of the output
DXGI_VK_MONITOR_DATA* monitorInfo = nullptr;
@ -628,6 +630,7 @@ namespace dxvk {
// Restore internal state
m_descFs.Windowed = TRUE;
m_monitor = nullptr;
m_target = nullptr;
// Only restore the window style if the application hasn't
// changed them. This is in line with what native DXGI does.

1
src/dxgi/dxgi_swapchain.h
View File

@ -178,6 +178,7 @@ namespace dxvk {
Com<IDXGIFactory> m_factory;
Com<IDXGIAdapter> m_adapter;
Com<IDXGIOutput> m_target;
Com<IDXGIVkMonitorInfo> m_monitorInfo;
HWND m_window;