Skip to content

Commit ed9ffa6

Browse files
gofmandoitsujin
gofman
authored and
doitsujin
committed
[dxgi] Leave fullscreen mode when window looses focus
1 parent 758dc80 commit ed9ffa6

13 files changed

+98
-6
lines changed

‎src/dxgi/dxgi_factory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ namespace dxvk {
302302
return hr;
303303
}
304304

305-
frontendSwapChain = new DxgiSwapChain(this, presenter.ptr(), hWnd, &desc, &fsDesc);
305+
frontendSwapChain = new DxgiSwapChain(this, presenter.ptr(), hWnd, &desc, &fsDesc, pDevice);
306306
} else {
307307
Logger::err("DXGI: CreateSwapChainForHwnd: Unsupported device type");
308308
return DXGI_ERROR_UNSUPPORTED;

‎src/dxgi/dxgi_swapchain.cpp

+20-4
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,26 @@
44

55
#include "../util/util_misc.h"
66

7+
#include <d3d12.h>
8+
79
namespace dxvk {
810

911
DxgiSwapChain::DxgiSwapChain(
1012
DxgiFactory* pFactory,
1113
IDXGIVkSwapChain* pPresenter,
1214
HWND hWnd,
1315
const DXGI_SWAP_CHAIN_DESC1* pDesc,
14-
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc)
16+
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc,
17+
IUnknown* pDevice)
1518
: m_factory (pFactory),
1619
m_window (hWnd),
1720
m_desc (*pDesc),
1821
m_descFs (*pFullscreenDesc),
1922
m_presentId (0u),
2023
m_presenter (pPresenter),
21-
m_monitor (wsi::getWindowMonitor(m_window)) {
24+
m_monitor (wsi::getWindowMonitor(m_window)),
25+
m_is_d3d12(SUCCEEDED(pDevice->QueryInterface(__uuidof(ID3D12CommandQueue), reinterpret_cast<void**>(&Com<ID3D12CommandQueue>())))) {
26+
2227
if (FAILED(m_presenter->GetAdapter(__uuidof(IDXGIAdapter), reinterpret_cast<void**>(&m_adapter))))
2328
throw DxvkError("DXGI: Failed to get adapter for present device");
2429

@@ -243,7 +248,9 @@ namespace dxvk {
243248
BOOL* pFullscreen,
244249
IDXGIOutput** ppTarget) {
245250
HRESULT hr = S_OK;
246-
251+
252+
if (!m_is_d3d12 && !m_descFs.Windowed && wsi::isOccluded(m_window))
253+
SetFullscreenState(FALSE, nullptr);
247254
if (pFullscreen != nullptr)
248255
*pFullscreen = !m_descFs.Windowed;
249256

@@ -325,6 +332,10 @@ namespace dxvk {
325332
if (SyncInterval > 4)
326333
return DXGI_ERROR_INVALID_CALL;
327334

335+
if ((m_desc.SwapEffect == DXGI_SWAP_EFFECT_DISCARD || m_desc.SwapEffect == DXGI_SWAP_EFFECT_SEQUENTIAL) && wsi::isMinimized(m_window))
336+
return DXGI_STATUS_OCCLUDED;
337+
bool occluded = !m_descFs.Windowed && wsi::isOccluded(m_window) && !wsi::isMinimized(m_window);
338+
328339
auto options = m_factory->GetOptions();
329340

330341
if (options->syncInterval >= 0)
@@ -342,7 +353,7 @@ namespace dxvk {
342353
}
343354

344355
if (PresentFlags & DXGI_PRESENT_TEST)
345-
return hr;
356+
return hr == S_OK && occluded ? DXGI_STATUS_OCCLUDED : hr;
346357

347358
if (hr == S_OK) {
348359

@@ -365,6 +376,11 @@ namespace dxvk {
365376
monitorData->FrameStats.PresentRefreshCount = monitorData->FrameStats.SyncRefreshCount + computeRefreshCount(t0, t1, refreshPeriod);
366377
ReleaseMonitorData();
367378
}
379+
if (occluded) {
380+
if (!(PresentFlags & DXGI_PRESENT_TEST))
381+
SetFullscreenState(FALSE, nullptr);
382+
hr = DXGI_STATUS_OCCLUDED;
383+
}
368384
}
369385

370386
return hr;

‎src/dxgi/dxgi_swapchain.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ namespace dxvk {
3131
IDXGIVkSwapChain* pPresenter,
3232
HWND hWnd,
3333
const DXGI_SWAP_CHAIN_DESC1* pDesc,
34-
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc);
34+
const DXGI_SWAP_CHAIN_FULLSCREEN_DESC* pFullscreenDesc,
35+
IUnknown* pDevice);
3536

3637
~DxgiSwapChain();
3738

@@ -198,6 +199,7 @@ namespace dxvk {
198199
double m_frameRateOption = 0.0;
199200
double m_frameRateRefresh = 0.0;
200201
double m_frameRateLimit = 0.0;
202+
bool m_is_d3d12;
201203

202204
DXGI_COLOR_SPACE_TYPE m_colorSpace = DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
203205

‎src/wsi/glfw/wsi_platform_glfw.h

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ namespace dxvk::wsi {
9595

9696
virtual bool isWindow(HWND hWindow);
9797

98+
virtual bool isMinimized(HWND hWindow);
99+
100+
virtual bool isOccluded(HWND hWindow);
101+
98102
virtual void updateFullscreenWindow(
99103
HMONITOR hMonitor,
100104
HWND hWindow,

‎src/wsi/glfw/wsi_window_glfw.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ namespace dxvk::wsi {
126126
return window != nullptr;
127127
}
128128

129+
130+
bool GlfwWsiDriver::isMinimized(HWND hWindow) {
131+
GLFWwindow* window = fromHwnd(hWindow);
132+
return glfwGetWindowAttrib(window, GLFW_ICONIFIED) != 0;
133+
}
134+
135+
136+
bool GlfwWsiDriver::isOccluded(HWND hWindow) {
137+
return false;
138+
}
139+
140+
129141
void GlfwWsiDriver::updateFullscreenWindow(
130142
HMONITOR hMonitor,
131143
HWND hWindow,

‎src/wsi/sdl2/wsi_platform_sdl2.h

+4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ namespace dxvk::wsi {
9393

9494
virtual bool isWindow(HWND hWindow);
9595

96+
virtual bool isMinimized(HWND hWindow);
97+
98+
virtual bool isOccluded(HWND hWindow);
99+
96100
virtual void updateFullscreenWindow(
97101
HMONITOR hMonitor,
98102
HWND hWindow,

‎src/wsi/sdl2/wsi_platform_sdl2_funcs.h

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ SDL_PROC(int, SDL_GetNumVideoDisplays, (void))
88
SDL_PROC(int, SDL_GetWindowDisplayIndex, (SDL_Window*))
99
SDL_PROC(int, SDL_SetWindowDisplayMode, (SDL_Window*, const SDL_DisplayMode*))
1010
SDL_PROC(int, SDL_SetWindowFullscreen, (SDL_Window*, Uint32))
11+
SDL_PROC(SDL_WindowFlags, SDL_GetWindowFlags, (SDL_Window *))
1112
SDL_PROC(void, SDL_GetWindowSize, (SDL_Window*, int*, int*))
1213
SDL_PROC(void, SDL_SetWindowSize, (SDL_Window*, int, int))
1314
SDL_PROC(SDL_bool, SDL_Vulkan_CreateSurface, (SDL_Window*, VkInstance, VkSurfaceKHR*))

‎src/wsi/sdl2/wsi_window_sdl2.cpp

+11
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,17 @@ namespace dxvk::wsi {
136136
}
137137

138138

139+
bool Sdl2WsiDriver::isMinimized(HWND hWindow) {
140+
SDL_Window* window = fromHwnd(hWindow);
141+
return (SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED) != 0;
142+
}
143+
144+
145+
bool Sdl2WsiDriver::isOccluded(HWND hWindow) {
146+
return false;
147+
}
148+
149+
139150
void Sdl2WsiDriver::updateFullscreenWindow(
140151
HMONITOR hMonitor,
141152
HWND hWindow,

‎src/wsi/win32/wsi_platform_win32.h

+4
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ namespace dxvk::wsi {
7777

7878
virtual bool isWindow(HWND hWindow);
7979

80+
virtual bool isMinimized(HWND hWindow);
81+
82+
virtual bool isOccluded(HWND hWindow);
83+
8084
virtual void updateFullscreenWindow(
8185
HMONITOR hMonitor,
8286
HWND hWindow,

‎src/wsi/win32/wsi_window_win32.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,16 @@ namespace dxvk::wsi {
254254
}
255255

256256

257+
bool Win32WsiDriver::isMinimized(HWND hWindow) {
258+
return (::GetWindowLongW(hWindow, GWL_STYLE) & WS_MINIMIZE) != 0;
259+
}
260+
261+
262+
bool Win32WsiDriver::isOccluded(HWND hWindow) {
263+
return ::GetForegroundWindow() != hWindow;
264+
}
265+
266+
257267
void Win32WsiDriver::updateFullscreenWindow(
258268
HMONITOR hMonitor,
259269
HWND hWindow,

‎src/wsi/wsi_platform.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@ namespace dxvk::wsi {
112112
return s_driver->isWindow(hWindow);
113113
}
114114

115+
bool isMinimized(HWND hWindow) {
116+
return s_driver->isMinimized(hWindow);
117+
}
118+
119+
bool isOccluded(HWND hWindow) {
120+
return s_driver->isOccluded(hWindow);
121+
}
122+
115123
void updateFullscreenWindow(
116124
HMONITOR hMonitor,
117125
HWND hWindow,

‎src/wsi/wsi_platform.h

+4
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ namespace dxvk::wsi {
8080

8181
virtual bool isWindow(HWND hWindow) = 0;
8282

83+
virtual bool isMinimized(HWND hWindow) = 0;
84+
85+
virtual bool isOccluded(HWND hWindow) = 0;
86+
8387
virtual void updateFullscreenWindow(
8488
HMONITOR hMonitor,
8589
HWND hWindow,

‎src/wsi/wsi_window.h

+16
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,22 @@ namespace dxvk::wsi {
117117
*/
118118
bool isWindow(HWND hWindow);
119119

120+
/**
121+
* \brief Is window minimized?
122+
*
123+
* \param [in] hWindow The window
124+
* \returns Is window minimized?
125+
*/
126+
bool isMinimized(HWND hWindow);
127+
128+
/**
129+
* \brief Is window occluded?
130+
*
131+
* \param [in] hWindow The window
132+
* \returns Is window occluded?
133+
*/
134+
bool isOccluded(HWND hWindow);
135+
120136
/**
121137
* \brief Update a fullscreen window's position/size
122138
*

0 commit comments

Comments
 (0)