lee/OptiScaler
1
0
Fork 0
mirror of https://github.com/optiscaler/OptiScaler.git synced 2026-09-23 13:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added EnableHotSwapping parameter for FFX Dx12

Browse Source
This commit is contained in:
cdozdil
2025-04-22 18:30:14 +03:00
parent 2a4f450120
commit cd38b0dbed
4 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler.ini
+4
View File
@@ -193,6 +193,10 @@ Fsr3Pattern=auto
; true or false - Default (auto) is true
Ffx=auto
; Enables hot swapping between games FSR3.1 upscaler and OptiScaler's selected upscaler
; true or false - Default (auto) is false
EnableHotSwapping=auto
; -------------------------------------------------------
OptiScaler/Config.cpp
+2
View File
@@ -389,6 +389,7 @@ bool Config::Reload(std::filesystem::path iniPath)
Fsr3Inputs.set_from_config(readBool("Inputs", "Fsr3"));
Fsr3Pattern.set_from_config(readBool("Inputs", "Fsr3Pattern"));
FfxInputs.set_from_config(readBool("Inputs", "Ffx"));
EnableHotSwapping.set_from_config(readBool("Inputs", "EnableHotSwapping"));
}
// Plugins
@@ -819,6 +820,7 @@ bool Config::SaveIni()
ini.SetValue("Inputs", "Fsr3", GetBoolValue(Instance()->Fsr3Inputs.value_for_config()).c_str());
ini.SetValue("Inputs", "Fsr3Pattern", GetBoolValue(Instance()->Fsr3Pattern.value_for_config()).c_str());
ini.SetValue("Inputs", "Ffx", GetBoolValue(Instance()->FfxInputs.value_for_config()).c_str());
ini.SetValue("Inputs", "EnableHotSwapping", GetBoolValue(Instance()->EnableHotSwapping.value_for_config()).c_str());
}
auto pathWStr = absoluteFileName.wstring();
OptiScaler/Config.h
+1
View File
@@ -363,6 +363,7 @@ public:
CustomOptional<bool> Fsr3Inputs{ true };
CustomOptional<bool> Fsr3Pattern{ false };
CustomOptional<bool> FfxInputs{ true };
CustomOptional<bool> EnableHotSwapping{ false };
// Framerate
CustomOptional<float> FramerateLimit{ 0.0f };
OptiScaler/inputs/FfxApi_Dx12.cpp
+35 -16
View File
@@ -15,6 +15,7 @@ static std::map<ffxContext, NVSDK_NGX_Handle*> _contexts;
static ID3D12Device* _d3d12Device = nullptr;
static bool _nvnxgInited = false;
static float qualityRatios[] = { 1.0, 1.5, 1.7, 2.0, 3.0 };
static size_t _contextCounter = 0;
static bool CreateDLSSContext(ffxContext handle, const ffxDispatchDescUpscale* pExecParams)
{
@@ -155,14 +156,6 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH
LOG_DEBUG("type: {:X}", desc->type);
auto ffxApiResult = FfxApiProxy::D3D12_CreateContext()(context, desc, memCb);
if (ffxApiResult != FFX_API_RETURN_OK)
{
LOG_ERROR("D3D12_CreateContext error: {:X} ({})", (UINT)ffxApiResult, FfxApiProxy::ReturnCodeToString(ffxApiResult));
return ffxApiResult;
}
bool upscaleContext = false;
ffxApiHeader* header = desc;
ffxCreateContextDescUpscale* createDesc = nullptr;
@@ -184,8 +177,16 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH
} while (header != nullptr);
if (!upscaleContext)
return ffxApiResult;
if (!upscaleContext || Config::Instance()->EnableHotSwapping.value_or_default())
{
auto ffxApiResult = FfxApiProxy::D3D12_CreateContext()(context, desc, memCb);
if (ffxApiResult != FFX_API_RETURN_OK)
LOG_ERROR("D3D12_CreateContext error: {:X} ({})", (UINT)ffxApiResult, FfxApiProxy::ReturnCodeToString(ffxApiResult));
if (!upscaleContext)
return ffxApiResult;
}
NVSDK_NGX_FeatureCommonInfo fcInfo{};
wchar_t const** paths = new const wchar_t* [1];
@@ -206,6 +207,11 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH
_nvnxgInited = true;
}
if (!Config::Instance()->EnableHotSwapping.value_or_default())
{
*context = (ffxContext)++_contextCounter;
LOG_INFO("Custom context index:{}", _contextCounter);
}
NVSDK_NGX_Parameter* params = nullptr;
@@ -232,15 +238,22 @@ ffxReturnCode_t ffxDestroyContext_Dx12(ffxContext* context, const ffxAllocationC
LOG_DEBUG("context: {:X}", (size_t)*context);
bool upscalerContext = false;
if (_contexts.contains(*context))
{
NVSDK_NGX_D3D12_ReleaseFeature(_contexts[*context]);
upscalerContext = true;
}
_contexts.erase(*context);
_nvParams.erase(*context);
_initParams.erase(*context);
auto cdResult = FfxApiProxy::D3D12_DestroyContext()(context, memCb);
LOG_INFO("result: {:X}", (UINT)cdResult);
if (!upscalerContext || Config::Instance()->EnableHotSwapping.value_or_default())
{
auto cdResult = FfxApiProxy::D3D12_DestroyContext()(context, memCb);
LOG_INFO("result: {:X}", (UINT)cdResult);
}
return FFX_API_RETURN_OK;
}
@@ -250,9 +263,9 @@ ffxReturnCode_t ffxConfigure_Dx12(ffxContext* context, const ffxConfigureDescHea
if (desc == nullptr)
return FFX_API_RETURN_ERROR_PARAMETER;
LOG_DEBUG("type: {:X}", desc->type);
LOG_DEBUG("type: {:X} (UPSCALE_KEYVALUE: 0x00010007)", desc->type);
if (desc->type == FFX_API_CONFIGURE_DESC_TYPE_UPSCALE_KEYVALUE)
if (desc->type == FFX_API_CONFIGURE_DESC_TYPE_UPSCALE_KEYVALUE && !Config::Instance()->EnableHotSwapping.value_or_default())
return FFX_API_RETURN_OK;
return FfxApiProxy::D3D12_Configure()(context, desc);
@@ -292,14 +305,20 @@ ffxReturnCode_t ffxQuery_Dx12(ffxContext* context, ffxQueryDescHeader* desc)
return FFX_API_RETURN_OK;
}
if (_contexts.contains(*context) && !Config::Instance()->EnableHotSwapping.value_or_default())
{
LOG_INFO("Hot swapping disabled, ignoring upscaler query");
return FFX_API_RETURN_OK;
}
return FfxApiProxy::D3D12_Query()(context, desc);
}
ffxReturnCode_t ffxDispatch_Dx12(ffxContext* context, ffxDispatchDescHeader* desc)
{
// Skip OptiScaler stuff
if (!Config::Instance()->FfxInputs.value_or_default())
if (Config::Instance()->EnableHotSwapping.value_or_default() && !Config::Instance()->FfxInputs.value_or_default())
return FfxApiProxy::D3D12_Dispatch()(context, desc);
if (desc == nullptr || context == nullptr)