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

Remove redundant DLSS file searches from inputs

Browse Source
This commit is contained in:
cdozdil
2026-05-04 17:53:39 +02:00
committed by FakeMichau
parent 253ee51342
commit 9972b08215
10 changed files with 42 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/inputs/FSR2_Dx11.cpp
-29
View File
@@ -217,36 +217,7 @@ static FfxErrorCode ffxFsr2ContextCreate_Dx11(FfxFsr2Context* context, FfxFsr2Co
if (!state.NvngxDx11Inited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D11_Init_with_ProjectID(
OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d11Device, &fcInfo,
OptiScaler/inputs/FSR2_Dx12.cpp
-29
View File
@@ -414,36 +414,7 @@ static Fsr212::FfxErrorCode ffxFsr2ContextCreate_Dx12(Fsr212::FfxFsr2Context* co
if (!state.NvngxDx12Inited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID(
OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo,
OptiScaler/inputs/FSR2_Vk.cpp
-29
View File
@@ -339,36 +339,7 @@ static FfxErrorCode ffxFsr2ContextCreate_Vk(FfxFsr2Context* context, FfxFsr2Cont
if (!state.NvngxVkInited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), State::Instance().VulkanInstance,
OptiScaler/inputs/FSR3_Dx12.cpp
-29
View File
@@ -264,36 +264,7 @@ static Fsr3::FfxErrorCode ffxFsr3ContextCreate_Dx12(Fsr3::FfxFsr3UpscalerContext
if (!state.NvngxDx12Inited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID(
OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo,
OptiScaler/inputs/FfxApiExe_Dx12.cpp
-30
View File
@@ -203,37 +203,7 @@ static ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateConte
if (!State::Instance().NvngxDx12Inited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID(
OPTI_GUID, State::Instance().NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo,
OptiScaler/inputs/FfxApi_Dx12.cpp
-29
View File
@@ -258,36 +258,7 @@ ffxReturnCode_t ffxCreateContext_Dx12(ffxContext* context, ffxCreateContextDescH
if (!state.NvngxDx12Inited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID(
OPTI_GUID, state.NVNGX_Engine, OPTI_VERSION, exePath.c_str(), _d3d12Device, &fcInfo,
OptiScaler/inputs/FfxApi_Vk.cpp
-29
View File
@@ -398,36 +398,7 @@ ffxReturnCode_t ffxCreateContext_Vk(ffxContext* context, ffxCreateContextDescHea
if (!State::Instance().NvngxVkInited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
OPTI_GUID, State::Instance().NVNGX_Engine, OPTI_VERSION, exePath.c_str(), State::Instance().VulkanInstance,
OptiScaler/inputs/XeSS_Dx11.cpp
+21 -21
View File
@@ -105,34 +105,34 @@ xess_result_t hk_xessD3D11CreateContext(ID3D11Device* device, xess_context_handl
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
// auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
// auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
// auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
// std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
// pathStorage.push_back(exePath.wstring());
// if (nvngxDlssPath.has_value())
// pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
// if (nvngxDlssDPath.has_value())
// pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
// if (nvngxDlssGPath.has_value())
// pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// if (Config::Instance()->DLSSFeaturePath.has_value())
// pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
//// Build pointer array
// wchar_t const** paths = new const wchar_t*[pathStorage.size()];
// for (size_t i = 0; i < pathStorage.size(); ++i)
//{
// paths[i] = pathStorage[i].c_str();
// }
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
// fcInfo.PathListInfo.Path = paths;
// fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D11_Init_with_ProjectID(
OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), device, &fcInfo,
OptiScaler/inputs/XeSS_Dx12.cpp
+21 -21
View File
@@ -106,34 +106,34 @@ xess_result_t hk_xessD3D12CreateContext(ID3D12Device* pDevice, xess_context_hand
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
// auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
// auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
// auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
// std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
// pathStorage.push_back(exePath.wstring());
// if (nvngxDlssPath.has_value())
// pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
// if (nvngxDlssDPath.has_value())
// pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
// if (nvngxDlssGPath.has_value())
// pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// if (Config::Instance()->DLSSFeaturePath.has_value())
// pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
//// Build pointer array
// wchar_t const** paths = new const wchar_t*[pathStorage.size()];
// for (size_t i = 0; i < pathStorage.size(); ++i)
//{
// paths[i] = pathStorage[i].c_str();
// }
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
// fcInfo.PathListInfo.Path = paths;
// fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_D3D12_Init_with_ProjectID(
OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), pDevice, &fcInfo,
OptiScaler/inputs/XeSS_Vulkan.cpp
-29
View File
@@ -132,36 +132,7 @@ xess_result_t hk_xessVKCreateContext(VkInstance instance, VkPhysicalDevice physi
if (!State::Instance().NvngxVkInited)
{
NVSDK_NGX_FeatureCommonInfo fcInfo {};
auto exePath = Util::ExePath().remove_filename();
auto nvngxDlssPath = Util::FindFilePath(exePath, "nvngx_dlss.dll");
auto nvngxDlssDPath = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
auto nvngxDlssGPath = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
std::vector<std::wstring> pathStorage;
pathStorage.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
pathStorage.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
pathStorage.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
pathStorage.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
pathStorage.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
wchar_t const** paths = new const wchar_t*[pathStorage.size()];
for (size_t i = 0; i < pathStorage.size(); ++i)
{
paths[i] = pathStorage[i].c_str();
}
fcInfo.PathListInfo.Path = paths;
fcInfo.PathListInfo.Length = (int) pathStorage.size();
auto nvResult = NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
OPTI_GUID, NVSDK_NGX_ENGINE_TYPE_CUSTOM, OPTI_VERSION, exePath.c_str(), _instance, _physicalDevice, _device,