lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-08-26 08:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with skip fix

Browse Source
This commit is contained in:
cdozdil
2025-10-03 14:01:23 +03:00
parent 7cd4d2af11 349ca3c476
commit a74d0e10b5
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/hooks/FG_Hooks.cpp
+11 -7
View File
@@ -324,13 +324,14 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi
if (_skipResize)
{
LOG_DEBUG("XeFG call skipping");
_skipResize = false;
return o_FGSCResizeBuffers(This, BufferCount, Width, Height, NewFormat, SwapChainFlags);
}
LOG_DEBUG("BufferCount: {}, Width: {}, Height: {}, NewFormat:{}, SwapChainFlags: {}", BufferCount, Width, Height,
(UINT) NewFormat, SwapChainFlags);
if (Config::Instance()->OverrideVsync.value_or_default() && !State::Instance().SCExclusiveFullscreen)
if (State::Instance().activeFgOutput == FGOutput::XeFG && !State::Instance().SCExclusiveFullscreen)
{
DXGI_SWAP_CHAIN_DESC desc {};
if (This->GetDesc(&desc) == S_OK)
@@ -364,13 +365,13 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi
fg->Deactivate();
}
_skipResize = true;
_skipResize1 = true;
State::Instance().skipSpoofing = true;
auto result = o_FGSCResizeBuffers(This, BufferCount, Width, Height, NewFormat, SwapChainFlags);
State::Instance().skipSpoofing = false;
_skipResize = false;
_skipResize1 = false;
LOG_DEBUG("Result: {:X}, Caller: {}", (UINT) result, Util::WhoIsTheCaller(_ReturnAddress()));
@@ -427,9 +428,10 @@ HRESULT FGHooks::hkResizeBuffers1(IDXGISwapChain* This, UINT BufferCount, UINT W
UINT SwapChainFlags, const UINT* pCreationNodeMask, IUnknown* const* ppPresentQueue)
{
// Skip XeFG's internal call
if (_skipResize)
if (_skipResize1)
{
LOG_DEBUG("XeFG call skipping");
_skipResize1 = false;
return o_FGSCResizeBuffers1(This, BufferCount, Width, Height, Format, SwapChainFlags, pCreationNodeMask,
ppPresentQueue);
}
@@ -518,14 +520,15 @@ HRESULT FGHooks::hkFGPresent(void* This, UINT SyncInterval, UINT Flags)
if (_skipPresent)
{
LOG_DEBUG("XeFG call skipping");
_skipPresent = false;
return o_FGSCPresent(This, SyncInterval, Flags);
}
LOG_DEBUG("SyncInterval: {}, Flags: {:X}", SyncInterval, Flags);
_skipPresent = true;
_skipPresent1 = true;
auto result = FGPresent(This, SyncInterval, Flags, nullptr);
_skipPresent = false;
_skipPresent1 = false;
return result;
}
@@ -534,9 +537,10 @@ HRESULT FGHooks::hkFGPresent1(void* This, UINT SyncInterval, UINT Flags,
const DXGI_PRESENT_PARAMETERS* pPresentParameters)
{
// Skip XeFG's internal call
if (_skipPresent)
if (_skipPresent1)
{
LOG_DEBUG("XeFG call skipping");
_skipPresent1 = false;
return o_FGSCPresent1(This, SyncInterval, Flags, pPresentParameters);
}
OptiScaler/hooks/FG_Hooks.h
+1
View File
@@ -39,6 +39,7 @@ class FGHooks
inline static PFN_Present1 o_FGSCPresent1 = nullptr;
inline static HWND _hwnd = nullptr;
inline static bool _skipResize = false;
inline static bool _skipResize1 = false;
inline static bool _skipPresent = false;
inline static UINT _lastPresentFlags = 0;
inline static double _lastFGFrameTime = 0.0;