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

wsi: Pass window state to setWindowMode

Browse Source
This commit is contained in:
Philip Rebohle 2024-10-26 13:50:57 +02:00 committed by Philip Rebohle
parent 5ad84563dd
commit 0259f55285
11 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d9/d3d9_swapchain.cpp
View File

@ -1331,7 +1331,7 @@ namespace dxvk {
HMONITOR monitor = wsi::getDefaultMonitor();
if (!wsi::setWindowMode(monitor, m_window, wsiMode))
if (!wsi::setWindowMode(monitor, m_window, &m_windowState, wsiMode))
return D3DERR_NOTAVAILABLE;
if (wsi::getCurrentDisplayMode(monitor, &wsiMode))

2
src/dxgi/dxgi_swapchain.cpp
View File

@ -813,7 +813,7 @@ namespace dxvk {
if (!selectedMode.RefreshRate.Denominator)
selectedMode.RefreshRate.Denominator = 1;
if (!wsi::setWindowMode(outputDesc.Monitor, m_window, ConvertDisplayMode(selectedMode)))
if (!wsi::setWindowMode(outputDesc.Monitor, m_window, &m_windowState, ConvertDisplayMode(selectedMode)))
return DXGI_ERROR_NOT_CURRENTLY_AVAILABLE;
DXGI_VK_MONITOR_DATA* monitorData = nullptr;

1
src/wsi/glfw/wsi_platform_glfw.h
View File

@ -75,6 +75,7 @@ namespace dxvk::wsi {
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode);
virtual bool enterFullscreenMode(

1
src/wsi/glfw/wsi_window_glfw.cpp
View File

@ -45,6 +45,7 @@ namespace dxvk::wsi {
bool GlfwWsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
GLFWwindow* window = fromHwnd(hWindow);

1
src/wsi/sdl2/wsi_platform_sdl2.h
View File

@ -73,6 +73,7 @@ namespace dxvk::wsi {
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode);
virtual bool enterFullscreenMode(

1
src/wsi/sdl2/wsi_window_sdl2.cpp
View File

@ -44,6 +44,7 @@ namespace dxvk::wsi {
bool Sdl2WsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
SDL_Window* window = fromHwnd(hWindow);

1
src/wsi/win32/wsi_platform_win32.h
View File

@ -60,6 +60,7 @@ namespace dxvk::wsi {
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode);
virtual bool enterFullscreenMode(

1
src/wsi/win32/wsi_window_win32.cpp
View File

@ -134,6 +134,7 @@ namespace dxvk::wsi {
bool Win32WsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode) {
::MONITORINFOEXW monInfo;
monInfo.cbSize = sizeof(monInfo);

3
src/wsi/wsi_platform.cpp
View File

@ -80,8 +80,9 @@ namespace dxvk::wsi {
bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode) {
return s_driver->setWindowMode(hMonitor, hWindow, mode);
return s_driver->setWindowMode(hMonitor, hWindow, pState, mode);
}
bool enterFullscreenMode(

1
src/wsi/wsi_platform.h
View File

@ -60,6 +60,7 @@ namespace dxvk::wsi {
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode) = 0;
virtual bool enterFullscreenMode(

2
src/wsi/wsi_window.h
View File

@ -58,12 +58,14 @@ namespace dxvk::wsi {
*
* \param [in] hMonitor The monitor
* \param [in] hWindow The window (may be unused on some platforms)
* \param [in] pState The swapchain's window state
* \param [in] mode The mode
* \returns \c true on success, \c false on failure
*/
bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
const WsiMode& mode);
/**