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

Reverted Resizebuffer change

Browse Source
This commit is contained in:
cdozdil
2025-12-27 09:36:54 +03:00
parent 5b9e9bf851
commit ef116eda9f
3 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler.ini
+1 -1
View File
@@ -190,7 +190,7 @@ ForceBorderless=auto
; Skip ResizeBuffers call to swapchain
; If old and new descriptions are the same
; Prevents crashes after ResizeBuffers calls
; true or false - Default (auto) is false
; true or false - Default (auto) is true
SkipResizeBuffers=auto
; Normally after ResizeBuffers call swapchain buffers
OptiScaler/Config.h
+1 -1
View File
@@ -465,7 +465,7 @@ class Config
CustomOptional<bool> FGXeFGHighResMV { false };
CustomOptional<bool> FGXeFGDebugView { false };
CustomOptional<bool> FGXeFGForceBorderless { false };
CustomOptional<bool> FGXeFGSkipResizeBuffers { false };
CustomOptional<bool> FGXeFGSkipResizeBuffers { true };
CustomOptional<bool> FGXeFGModifyBufferState { false };
CustomOptional<bool> FGXeFGModifySCIndex { false };
OptiScaler/hooks/FG_Hooks.cpp
+70 -19
View File
@@ -392,15 +392,19 @@ HRESULT FGHooks::hkResizeBuffers(IDXGISwapChain* This, UINT BufferCount, UINT Wi
IDXGISwapChain* sc = nullptr;
if (State::Instance().currentWrappedSwapchain != nullptr)
sc = State::Instance().currentWrappedSwapchain;
else if (State::Instance().currentSwapchain != nullptr)
sc = State::Instance().currentSwapchain;
else if (State::Instance().currentRealSwapchain != nullptr)
sc = State::Instance().currentRealSwapchain;
// if (State::Instance().currentWrappedSwapchain != nullptr)
// sc = State::Instance().currentWrappedSwapchain;
// else if (State::Instance().currentSwapchain != nullptr)
// sc = State::Instance().currentSwapchain;
// else if (State::Instance().currentRealSwapchain != nullptr)
// sc = State::Instance().currentRealSwapchain;
if (sc != nullptr)
return sc->ResizeBuffers(BufferCount, Width, Height, NewFormat, SwapChainFlags);
{
auto result = sc->ResizeBuffers(BufferCount, Width, Height, NewFormat, SwapChainFlags);
LOG_DEBUG("XeFG internal ResizeBuffers result: {:X}", (UINT) result);
return result;
}
return o_FGSCResizeBuffers(This, BufferCount, Width, Height, NewFormat, SwapChainFlags);
}
@@ -581,16 +585,21 @@ HRESULT FGHooks::hkResizeBuffers1(IDXGISwapChain* This, UINT BufferCount, UINT W
IDXGISwapChain3* sc = nullptr;
if (State::Instance().currentWrappedSwapchain != nullptr)
sc = (IDXGISwapChain3*) State::Instance().currentWrappedSwapchain;
else if (State::Instance().currentSwapchain != nullptr)
sc = (IDXGISwapChain3*) State::Instance().currentSwapchain;
else if (State::Instance().currentRealSwapchain != nullptr)
sc = (IDXGISwapChain3*) State::Instance().currentRealSwapchain;
// if (State::Instance().currentWrappedSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentWrappedSwapchain;
// else if (State::Instance().currentSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentSwapchain;
// else if (State::Instance().currentRealSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentRealSwapchain;
if (sc != nullptr)
return sc->ResizeBuffers1(BufferCount, Width, Height, Format, SwapChainFlags, pCreationNodeMask,
ppPresentQueue);
{
auto result = sc->ResizeBuffers1(BufferCount, Width, Height, Format, SwapChainFlags, pCreationNodeMask,
ppPresentQueue);
LOG_DEBUG("XeFG internal ResizeBuffers1 result: {:X}", (UINT) result);
return result;
}
return o_FGSCResizeBuffers1(This, BufferCount, Width, Height, Format, SwapChainFlags, pCreationNodeMask,
ppPresentQueue);
@@ -747,8 +756,29 @@ HRESULT FGHooks::hkFGPresent(void* This, UINT SyncInterval, UINT Flags)
if (_skipPresent)
{
LOG_DEBUG("XeFG call skipping");
auto result = o_FGSCPresent(This, SyncInterval, Flags);
LOG_DEBUG("o_FGSCPresent result: {:X}", (UINT) result);
IDXGISwapChain* sc = nullptr;
// if (State::Instance().currentWrappedSwapchain != nullptr)
// sc = State::Instance().currentWrappedSwapchain;
// else if (State::Instance().currentSwapchain != nullptr)
// sc = State::Instance().currentSwapchain;
// else if (State::Instance().currentRealSwapchain != nullptr)
// sc = State::Instance().currentRealSwapchain;
HRESULT result;
if (sc != nullptr)
{
result = sc->Present(SyncInterval, Flags);
LOG_DEBUG("sc->Present result: {:X}", (UINT) result);
}
else
{
result = o_FGSCPresent(This, SyncInterval, Flags);
LOG_DEBUG("o_FGSCPresent result: {:X}", (UINT) result);
}
return result;
}
@@ -768,8 +798,29 @@ HRESULT FGHooks::hkFGPresent1(void* This, UINT SyncInterval, UINT Flags,
if (_skipPresent1)
{
LOG_DEBUG("XeFG call skipping");
auto result = o_FGSCPresent1(This, SyncInterval, Flags, pPresentParameters);
LOG_DEBUG("o_FGSCPresent result: {:X}", (UINT) result);
IDXGISwapChain3* sc = nullptr;
// if (State::Instance().currentWrappedSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentWrappedSwapchain;
// else if (State::Instance().currentSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentSwapchain;
// else if (State::Instance().currentRealSwapchain != nullptr)
// sc = (IDXGISwapChain3*) State::Instance().currentRealSwapchain;
HRESULT result;
if (sc != nullptr)
{
result = sc->Present1(SyncInterval, Flags, pPresentParameters);
LOG_DEBUG("sc->Present result: {:X}", (UINT) result);
}
else
{
result = o_FGSCPresent1(This, SyncInterval, Flags, pPresentParameters);
LOG_DEBUG("o_FGSCPresent result: {:X}", (UINT) result);
}
return result;
}