rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-24 04:54:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Always limit to display refresh in low latency mode

Browse Source
This commit is contained in:
Philip Rebohle 2025-01-20 13:27:55 +01:00
parent a537ecf421
commit 1eb7da548c
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/d3d9/d3d9_swapchain.cpp
View File

@ -146,9 +146,15 @@ namespace dxvk {
if (options->presentInterval >= 0) if (options->presentInterval >= 0)
presentInterval = options->presentInterval; presentInterval = options->presentInterval;
m_window = m_presentParams.hDeviceWindow; HWND window = m_presentParams.hDeviceWindow;
if (hDestWindowOverride != nullptr) if (hDestWindowOverride != nullptr)
m_window = hDestWindowOverride; window = hDestWindowOverride;
if (m_window != window) {
m_window = window;
m_displayRefreshRateDirty = true;
}
if (!UpdateWindowCtx()) if (!UpdateWindowCtx())
return D3D_OK; return D3D_OK;
@ -171,6 +177,7 @@ namespace dxvk {
// We aren't going to device loss simply because // We aren't going to device loss simply because
// 99% of D3D9 games don't handle this properly and // 99% of D3D9 games don't handle this properly and
// just end up crashing (like with alt-tab loss) // just end up crashing (like with alt-tab loss)
UpdateWindowedRefreshRate();
UpdateTargetFrameRate(presentInterval); UpdateTargetFrameRate(presentInterval);
PresentImage(presentInterval); PresentImage(presentInterval);
return D3D_OK; return D3D_OK;
@ -1096,8 +1103,13 @@ namespace dxvk {
double frameRateOption = double(m_parent->GetOptions()->maxFrameRate); double frameRateOption = double(m_parent->GetOptions()->maxFrameRate);
double frameRate = std::max(frameRateOption, 0.0); double frameRate = std::max(frameRateOption, 0.0);
if (SyncInterval && frameRateOption == 0.0) if (frameRateOption == 0.0 && SyncInterval) {
frameRate = -m_displayRefreshRate / double(SyncInterval); bool engageLimiter = SyncInterval > 1u || m_monitor ||
m_device->config().latencySleep == Tristate::True;
if (engageLimiter)
frameRate = -m_displayRefreshRate / double(SyncInterval);
}
m_wctx->presenter->setFrameRateLimit(frameRate, GetActualFrameLatency()); m_wctx->presenter->setFrameRateLimit(frameRate, GetActualFrameLatency());
m_targetFrameRate = frameRate; m_targetFrameRate = frameRate;
@ -1166,9 +1178,29 @@ namespace dxvk {
} }
void D3D9SwapChainEx::NotifyDisplayRefreshRate( void D3D9SwapChainEx::UpdateWindowedRefreshRate() {
double RefreshRate) { // Ignore call if we are in fullscreen mode and
m_displayRefreshRate = RefreshRate; // know the active display mode already anyway
if (!m_displayRefreshRateDirty || m_monitor)
return;
m_displayRefreshRate = 0.0;
m_displayRefreshRateDirty = false;
HMONITOR monitor = wsi::getWindowMonitor(m_window);
if (!monitor)
return;
wsi::WsiMode mode = { };
if (!wsi::getCurrentDisplayMode(monitor, &mode))
return;
if (mode.refreshRate.denominator) {
m_displayRefreshRate = double(mode.refreshRate.numerator)
/ double(mode.refreshRate.denominator);
}
} }
@ -1247,12 +1279,15 @@ namespace dxvk {
if (!wsi::setWindowMode(monitor, m_window, &m_windowState, wsiMode)) if (!wsi::setWindowMode(monitor, m_window, &m_windowState, wsiMode))
return D3DERR_NOTAVAILABLE; return D3DERR_NOTAVAILABLE;
if (wsi::getCurrentDisplayMode(monitor, &wsiMode))
NotifyDisplayRefreshRate(double(wsiMode.refreshRate.numerator) / double(wsiMode.refreshRate.denominator));
else
NotifyDisplayRefreshRate(0.0);
m_displayRefreshRate = 0.0;
if (wsi::getCurrentDisplayMode(monitor, &wsiMode)) {
m_displayRefreshRate = double(wsiMode.refreshRate.numerator)
/ double(wsiMode.refreshRate.denominator);
}
m_displayRefreshRateDirty = false;
return D3D_OK; return D3D_OK;
} }
@ -1264,7 +1299,7 @@ namespace dxvk {
if (!wsi::restoreDisplayMode()) if (!wsi::restoreDisplayMode())
return D3DERR_NOTAVAILABLE; return D3DERR_NOTAVAILABLE;
NotifyDisplayRefreshRate(0.0); m_displayRefreshRateDirty = true;
return D3D_OK; return D3D_OK;
} }

7
src/d3d9/d3d9_swapchain.h
View File

@ -173,9 +173,11 @@ namespace dxvk {
wsi::DxvkWindowState m_windowState; wsi::DxvkWindowState m_windowState;
double m_displayRefreshRate = 0.0;
double m_targetFrameRate = 0.0; double m_targetFrameRate = 0.0;
double m_displayRefreshRate = 0.0;
bool m_displayRefreshRateDirty = true;
bool m_warnedAboutGDIFallback = false; bool m_warnedAboutGDIFallback = false;
VkColorSpaceKHR m_colorspace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; VkColorSpaceKHR m_colorspace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
@ -215,8 +217,7 @@ namespace dxvk {
void NormalizePresentParameters(D3DPRESENT_PARAMETERS* pPresentParams); void NormalizePresentParameters(D3DPRESENT_PARAMETERS* pPresentParams);
void NotifyDisplayRefreshRate( void UpdateWindowedRefreshRate();
double RefreshRate);
HRESULT EnterFullscreenMode( HRESULT EnterFullscreenMode(
D3DPRESENT_PARAMETERS* pPresentParams, D3DPRESENT_PARAMETERS* pPresentParams,