mirror of
https://github.com/optiscaler/OptiScaler.git
synced 2026-09-24 22:35:57 +00:00
Fix for DLSS init from XeSS or FSR
This commit is contained in:
@@ -413,13 +413,13 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Dx12(Fsr212::FfxFsr2Context* co
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
@@ -522,13 +522,13 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Pattern_Dx12(Fsr212::FfxFsr2Con
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -235,13 +235,13 @@ static Fsr3::FfxErrorCode ffxFsr3ContextCreate_Dx12(Fsr3::FfxFsr3UpscalerContext
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
@@ -439,13 +439,13 @@ ffxFsr3ContextCreate_Pattern_Dx12(Fsr3::FfxFsr3UpscalerContext* pContext,
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -213,13 +213,13 @@ static ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateConte
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -268,13 +268,13 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -337,13 +337,13 @@ ffxReturnCode_t ffxCreateContext_Vk(ffxContext* context, ffxCreateContextDescHea
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -108,13 +108,13 @@ xess_result_t hk_xessD3D12CreateContext(ID3D12Device* pDevice, xess_context_hand
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
@@ -136,13 +136,13 @@ xess_result_t hk_xessVKCreateContext(VkInstance instance, VkPhysicalDevice physi
|
||||
pathStorage.push_back(dllPath.wstring());
|
||||
|
||||
if (nvngxDlssPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssDPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssDPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
|
||||
|
||||
if (nvngxDlssGPath.has_value())
|
||||
pathStorage.push_back(nvngxDlssGPath.value().wstring());
|
||||
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
|
||||
|
||||
if (Config::Instance()->DLSSFeaturePath.has_value())
|
||||
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
|
||||
|
||||
Reference in New Issue
Block a user