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

Check DLSS files and use their locations when initing NVSDK

Browse Source
This commit is contained in:
cdozdil
2026-05-04 16:54:12 +03:00
parent fa553dd8f8
commit acfe3ae7fa
3 changed files with 367 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OptiScaler/inputs/NVNGX_DLSS_Dx11.cpp
+115 -12
View File
@@ -14,11 +14,12 @@
#include <ankerl/unordered_dense.h>
inline ID3D11Device* D3D11Device = nullptr;
static ID3D11Device* D3D11Device = nullptr;
static ankerl::unordered_dense::map<unsigned int, ContextData<IFeature_Dx11>> Dx11Contexts;
static inline int evalCounter = 0;
static inline bool shutdown = false;
static inline bool _skipInit = false;
static int evalCounter = 0;
static bool shutdown = false;
static bool _skipInit = false;
static wchar_t const** paths;
class ScopedInitDx11
{
@@ -34,6 +35,90 @@ class ScopedInitDx11
~ScopedInitDx11() { _skipInit = previousState; }
};
static void UpdateInitPaths(NVSDK_NGX_FeatureCommonInfo* InFeatureInfo)
{
State::Instance().NVNGX_FeatureInfo_Paths.clear();
if (InFeatureInfo != nullptr)
{
for (size_t i = 0; i < InFeatureInfo->PathListInfo.Length; i++)
{
const wchar_t* path = InFeatureInfo->PathListInfo.Path[i];
State::Instance().NVNGX_FeatureInfo_Paths.push_back(std::wstring(path));
}
auto exePath = Util::ExePath().remove_filename();
std::optional<std::filesystem::path> nvngxDlssPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssDPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssGPath = std::nullopt;
// Check DLSS path
if (State::Instance().NVNGX_DLSS_Path.has_value())
{
nvngxDlssPath = std::filesystem::path(State::Instance().NVNGX_DLSS_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlss.dll");
if (path.has_value())
nvngxDlssPath = path.value();
}
// Check DLSS-D path
if (State::Instance().NVNGX_DLSSD_Path.has_value())
{
nvngxDlssDPath = std::filesystem::path(State::Instance().NVNGX_DLSSD_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
if (path.has_value())
nvngxDlssDPath = path.value();
}
// Check DLSS-G path
if (State::Instance().NVNGX_DLSSG_Path.has_value())
{
nvngxDlssGPath = std::filesystem::path(State::Instance().NVNGX_DLSSG_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
if (path.has_value())
nvngxDlssGPath = path.value();
}
// Add found locations
State::Instance().NVNGX_FeatureInfo_Paths.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
paths = new const wchar_t*[State::Instance().NVNGX_FeatureInfo_Paths.size()];
for (size_t i = 0; i < State::Instance().NVNGX_FeatureInfo_Paths.size(); ++i)
{
paths[i] = State::Instance().NVNGX_FeatureInfo_Paths[i].c_str();
LOG_DEBUG("Feature Path [{}]: {}", i, wstring_to_string(State::Instance().NVNGX_FeatureInfo_Paths[i]));
}
InFeatureInfo->PathListInfo.Path = paths;
InFeatureInfo->PathListInfo.Length = (int) State::Instance().NVNGX_FeatureInfo_Paths.size();
}
}
#pragma region NVSDK_NGX_D3D11_Init
NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_Ext(unsigned long long InApplicationId,
@@ -41,6 +126,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_Ext(unsigned long long InApp
NVSDK_NGX_Version InSDKVersion,
const NVSDK_NGX_FeatureCommonInfo* InFeatureInfo)
{
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -54,7 +145,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_Ext(unsigned long long InApp
LOG_INFO("calling NVNGXProxy::D3D11_Init_Ext");
auto result = NVNGXProxy::D3D11_Init_Ext()(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion,
InFeatureInfo);
&localFeatureInfo);
LOG_INFO("calling NVNGXProxy::D3D11_Init_Ext result: {0:X}", (UINT) result);
@@ -107,6 +198,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init(unsigned long long InApplica
const NVSDK_NGX_FeatureCommonInfo* InFeatureInfo,
NVSDK_NGX_Version InSDKVersion)
{
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -119,8 +216,8 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init(unsigned long long InApplica
{
LOG_INFO("calling NVNGXProxy::D3D11_Init");
auto result =
NVNGXProxy::D3D11_Init()(InApplicationId, InApplicationDataPath, InDevice, InFeatureInfo, InSDKVersion);
auto result = NVNGXProxy::D3D11_Init()(InApplicationId, InApplicationDataPath, InDevice, &localFeatureInfo,
InSDKVersion);
LOG_INFO("calling NVNGXProxy::D3D11_Init result: {0:X}", (UINT) result);
@@ -129,8 +226,8 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init(unsigned long long InApplica
}
}
ScopedInit scopedInit {};
auto result = NVSDK_NGX_D3D11_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, InFeatureInfo);
ScopedInitDx11 scopedInit {};
auto result = NVSDK_NGX_D3D11_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, &localFeatureInfo);
LOG_DEBUG("was called NVSDK_NGX_D3D11_Init_Ext");
return result;
}
@@ -142,6 +239,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_ProjectID(const char* InProj
ID3D11Device* InDevice, NVSDK_NGX_Version InSDKVersion,
const NVSDK_NGX_FeatureCommonInfo* InFeatureInfo)
{
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -156,7 +259,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_ProjectID(const char* InProj
auto result =
NVNGXProxy::D3D11_Init_ProjectID()(InProjectId, InEngineType, InEngineVersion, InApplicationDataPath,
InDevice, InSDKVersion, InFeatureInfo);
InDevice, InSDKVersion, &localFeatureInfo);
LOG_INFO("calling NVNGXProxy::D3D11_Init_ProjectID result: {0:X}", (UINT) result);
@@ -165,8 +268,8 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D11_Init_ProjectID(const char* InProj
}
}
ScopedInit scopedInit {};
auto result = NVSDK_NGX_D3D11_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, InFeatureInfo);
ScopedInitDx11 scopedInit {};
auto result = NVSDK_NGX_D3D11_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, &localFeatureInfo);
LOG_INFO("InProjectId: {0}", InProjectId);
LOG_INFO("InEngineType: {0}", (int) InEngineType);
OptiScaler/inputs/NVNGX_DLSS_Dx12.cpp
+114 -22
View File
@@ -28,7 +28,8 @@ static ID3D12Device* D3D12Device = nullptr;
static int evalCounter = 0;
static std::wstring appDataPath = L".";
static bool shutdown = false;
static inline bool _skipInit = false;
static bool _skipInit = false;
static wchar_t const** paths;
class ScopedInitDx12
{
@@ -45,6 +46,90 @@ class ScopedInitDx12
~ScopedInitDx12() { _skipInit = previousState; }
};
static void UpdateInitPaths(NVSDK_NGX_FeatureCommonInfo* InFeatureInfo)
{
State::Instance().NVNGX_FeatureInfo_Paths.clear();
if (InFeatureInfo != nullptr)
{
for (size_t i = 0; i < InFeatureInfo->PathListInfo.Length; i++)
{
const wchar_t* path = InFeatureInfo->PathListInfo.Path[i];
State::Instance().NVNGX_FeatureInfo_Paths.push_back(std::wstring(path));
}
auto exePath = Util::ExePath().remove_filename();
std::optional<std::filesystem::path> nvngxDlssPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssDPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssGPath = std::nullopt;
// Check DLSS path
if (State::Instance().NVNGX_DLSS_Path.has_value())
{
nvngxDlssPath = std::filesystem::path(State::Instance().NVNGX_DLSS_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlss.dll");
if (path.has_value())
nvngxDlssPath = path.value();
}
// Check DLSS-D path
if (State::Instance().NVNGX_DLSSD_Path.has_value())
{
nvngxDlssDPath = std::filesystem::path(State::Instance().NVNGX_DLSSD_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
if (path.has_value())
nvngxDlssDPath = path.value();
}
// Check DLSS-G path
if (State::Instance().NVNGX_DLSSG_Path.has_value())
{
nvngxDlssGPath = std::filesystem::path(State::Instance().NVNGX_DLSSG_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
if (path.has_value())
nvngxDlssGPath = path.value();
}
// Add found locations
State::Instance().NVNGX_FeatureInfo_Paths.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
paths = new const wchar_t*[State::Instance().NVNGX_FeatureInfo_Paths.size()];
for (size_t i = 0; i < State::Instance().NVNGX_FeatureInfo_Paths.size(); ++i)
{
paths[i] = State::Instance().NVNGX_FeatureInfo_Paths[i].c_str();
LOG_DEBUG("Feature Path [{}]: {}", i, wstring_to_string(State::Instance().NVNGX_FeatureInfo_Paths[i]));
}
InFeatureInfo->PathListInfo.Path = paths;
InFeatureInfo->PathListInfo.Length = (int) State::Instance().NVNGX_FeatureInfo_Paths.size();
}
}
#pragma region DLSS Init Calls
NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApplicationId,
@@ -57,10 +142,16 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
InApplicationId = app_id_override;
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
State::Instance().NVNGX_ApplicationId = InApplicationId;
State::Instance().NVNGX_ApplicationDataPath = std::wstring(InApplicationDataPath);
State::Instance().NVNGX_Version = InSDKVersion;
State::Instance().NVNGX_FeatureInfo = InFeatureInfo;
State::Instance().NVNGX_FeatureInfo = &localFeatureInfo;
if (InFeatureInfo != nullptr && InSDKVersion > 0x0000013)
State::Instance().NVNGX_Logger = InFeatureInfo->LoggingInfo;
@@ -74,7 +165,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp
{
LOG_INFO("calling NVNGXProxy::D3D12_Init_Ext");
auto result = NVNGXProxy::D3D12_Init_Ext()(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion,
InFeatureInfo);
&localFeatureInfo);
LOG_INFO("calling NVNGXProxy::D3D12_Init_Ext result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -95,7 +186,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp
if (State::Instance().activeFgInput == FGInput::Nukems)
{
DLSSGMod::InitDLSSGMod_Dx12();
DLSSGMod::D3D12_Init_Ext(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion, InFeatureInfo);
DLSSGMod::D3D12_Init_Ext(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion, &localFeatureInfo);
}
LOG_INFO("AppId: {0}", InApplicationId);
@@ -104,17 +195,6 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_Ext(unsigned long long InApp
LOG_INFO("InApplicationDataPath {0}", wstring_to_string(appDataPath));
State::Instance().NVNGX_FeatureInfo_Paths.clear();
if (InFeatureInfo != nullptr)
{
for (size_t i = 0; i < InFeatureInfo->PathListInfo.Length; i++)
{
const wchar_t* path = InFeatureInfo->PathListInfo.Path[i];
State::Instance().NVNGX_FeatureInfo_Paths.push_back(std::wstring(path));
}
}
D3D12Device = InDevice;
State::Instance().currentD3D12Device = InDevice;
D3D12Hooks::HookDevice(InDevice);
@@ -138,6 +218,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init(unsigned long long InApplica
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -150,8 +236,8 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init(unsigned long long InApplica
{
LOG_INFO("calling NVNGXProxy::D3D12_Init");
auto result =
NVNGXProxy::D3D12_Init()(InApplicationId, InApplicationDataPath, InDevice, InFeatureInfo, InSDKVersion);
auto result = NVNGXProxy::D3D12_Init()(InApplicationId, InApplicationDataPath, InDevice, &localFeatureInfo,
InSDKVersion);
LOG_INFO("calling NVNGXProxy::D3D12_Init result: {0:X}", (UINT) result);
@@ -172,9 +258,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init(unsigned long long InApplica
// DLSSGMod::D3D12_Init(InApplicationId, InApplicationDataPath, InDevice, InFeatureInfo, InSDKVersion);
// }
ScopedInit scopedInit {};
ScopedInitDx12 scopedInit {};
auto result =
NVSDK_NGX_D3D12_Init_Ext(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion, InFeatureInfo);
NVSDK_NGX_D3D12_Init_Ext(InApplicationId, InApplicationDataPath, InDevice, InSDKVersion, &localFeatureInfo);
LOG_DEBUG("was called NVSDK_NGX_D3D12_Init_Ext");
return result;
}
@@ -188,6 +274,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_ProjectID(const char* InProj
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -202,7 +294,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_ProjectID(const char* InProj
auto result =
NVNGXProxy::D3D12_Init_ProjectID()(InProjectId, InEngineType, InEngineVersion, InApplicationDataPath,
InDevice, InSDKVersion, InFeatureInfo);
InDevice, InSDKVersion, &localFeatureInfo);
LOG_INFO("calling NVNGXProxy::D3D12_Init_ProjectID result: {0:X}", (UINT) result);
@@ -225,8 +317,8 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_D3D12_Init_ProjectID(const char* InProj
return NVSDK_NGX_Result_Success;
}
ScopedInit scopedInit {};
auto result = NVSDK_NGX_D3D12_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, InFeatureInfo);
ScopedInitDx12 scopedInit {};
auto result = NVSDK_NGX_D3D12_Init_Ext(0x1337, InApplicationDataPath, InDevice, InSDKVersion, &localFeatureInfo);
return result;
}
OptiScaler/inputs/NVNGX_DLSS_Vk.cpp
+138 -22
View File
@@ -22,9 +22,10 @@ PFN_vkGetInstanceProcAddr vkGIPA;
PFN_vkGetDeviceProcAddr vkGDPA;
static ankerl::unordered_dense::map<unsigned int, ContextData<IFeature_Vk>> VkContexts;
static inline int evalCounter = 0;
static inline bool shutdown = false;
static inline bool _skipInit = false;
static int evalCounter = 0;
static bool shutdown = false;
static bool _skipInit = false;
static wchar_t const** paths;
class ScopedInitVk
{
@@ -40,6 +41,90 @@ class ScopedInitVk
~ScopedInitVk() { _skipInit = previousState; }
};
static void UpdateInitPaths(NVSDK_NGX_FeatureCommonInfo* InFeatureInfo)
{
State::Instance().NVNGX_FeatureInfo_Paths.clear();
if (InFeatureInfo != nullptr)
{
for (size_t i = 0; i < InFeatureInfo->PathListInfo.Length; i++)
{
const wchar_t* path = InFeatureInfo->PathListInfo.Path[i];
State::Instance().NVNGX_FeatureInfo_Paths.push_back(std::wstring(path));
}
auto exePath = Util::ExePath().remove_filename();
std::optional<std::filesystem::path> nvngxDlssPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssDPath = std::nullopt;
std::optional<std::filesystem::path> nvngxDlssGPath = std::nullopt;
// Check DLSS path
if (State::Instance().NVNGX_DLSS_Path.has_value())
{
nvngxDlssPath = std::filesystem::path(State::Instance().NVNGX_DLSS_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlss.dll");
if (path.has_value())
nvngxDlssPath = path.value();
}
// Check DLSS-D path
if (State::Instance().NVNGX_DLSSD_Path.has_value())
{
nvngxDlssDPath = std::filesystem::path(State::Instance().NVNGX_DLSSD_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssd.dll");
if (path.has_value())
nvngxDlssDPath = path.value();
}
// Check DLSS-G path
if (State::Instance().NVNGX_DLSSG_Path.has_value())
{
nvngxDlssGPath = std::filesystem::path(State::Instance().NVNGX_DLSSG_Path.value());
}
else
{
auto path = Util::FindFilePath(exePath, "nvngx_dlssg.dll");
if (path.has_value())
nvngxDlssGPath = path.value();
}
// Add found locations
State::Instance().NVNGX_FeatureInfo_Paths.push_back(exePath.wstring());
if (nvngxDlssPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssPath.value().parent_path().wstring());
if (nvngxDlssDPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssDPath.value().parent_path().wstring());
if (nvngxDlssGPath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(nvngxDlssGPath.value().parent_path().wstring());
if (Config::Instance()->DLSSFeaturePath.has_value())
State::Instance().NVNGX_FeatureInfo_Paths.push_back(Config::Instance()->DLSSFeaturePath.value());
// Build pointer array
paths = new const wchar_t*[State::Instance().NVNGX_FeatureInfo_Paths.size()];
for (size_t i = 0; i < State::Instance().NVNGX_FeatureInfo_Paths.size(); ++i)
{
paths[i] = State::Instance().NVNGX_FeatureInfo_Paths[i].c_str();
LOG_DEBUG("Feature Path [{}]: {}", i, wstring_to_string(State::Instance().NVNGX_FeatureInfo_Paths[i]));
}
InFeatureInfo->PathListInfo.Path = paths;
InFeatureInfo->PathListInfo.Length = (int) State::Instance().NVNGX_FeatureInfo_Paths.size();
}
}
NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2(
unsigned long long InApplicationId, const wchar_t* InApplicationDataPath, VkInstance InInstance,
VkPhysicalDevice InPD, VkDevice InDevice, PFN_vkGetInstanceProcAddr InGIPA, PFN_vkGetDeviceProcAddr InGDPA,
@@ -47,6 +132,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2(
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -59,7 +150,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2(
{
LOG_INFO("calling NVNGXProxy::VULKAN_Init_Ext2");
auto result = NVNGXProxy::VULKAN_Init_Ext2()(InApplicationId, InApplicationDataPath, InInstance, InPD,
InDevice, InGIPA, InGDPA, InSDKVersion, InFeatureInfo);
InDevice, InGIPA, InGDPA, InSDKVersion, &localFeatureInfo);
LOG_INFO("NVNGXProxy::VULKAN_Init_Ext2 result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -69,12 +160,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2(
DLSSGMod::InitDLSSGMod_Vulkan();
DLSSGMod::VULKAN_Init_Ext2(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice, InGIPA, InGDPA,
InSDKVersion, InFeatureInfo);
InSDKVersion, &localFeatureInfo);
State::Instance().NVNGX_ApplicationId = InApplicationId;
State::Instance().NVNGX_ApplicationDataPath = std::wstring(InApplicationDataPath);
State::Instance().NVNGX_Version = InSDKVersion;
State::Instance().NVNGX_FeatureInfo = InFeatureInfo;
State::Instance().NVNGX_FeatureInfo = &localFeatureInfo;
State::Instance().NVNGX_Version = InSDKVersion;
State::Instance().NVNGX_FeatureInfo_Paths.clear();
@@ -82,14 +173,14 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext2(
if (InFeatureInfo != nullptr)
{
if (InSDKVersion > 0x0000013)
State::Instance().NVNGX_Logger = InFeatureInfo->LoggingInfo;
State::Instance().NVNGX_Logger = localFeatureInfo.LoggingInfo;
// Doom Ethernal is sending junk data
if (InFeatureInfo->PathListInfo.Length < 10)
if (localFeatureInfo.PathListInfo.Length < 10)
{
for (size_t i = 0; i < InFeatureInfo->PathListInfo.Length; i++)
for (size_t i = 0; i < localFeatureInfo.PathListInfo.Length; i++)
{
const wchar_t* path = InFeatureInfo->PathListInfo.Path[i];
const wchar_t* path = localFeatureInfo.PathListInfo.Path[i];
State::Instance().NVNGX_FeatureInfo_Paths.push_back(std::wstring(path));
}
}
@@ -166,6 +257,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext(unsigned long long InAp
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -178,7 +275,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext(unsigned long long InAp
{
LOG_INFO("calling NVNGXProxy::VULKAN_Init_Ext");
auto result = NVNGXProxy::VULKAN_Init_Ext()(InApplicationId, InApplicationDataPath, InInstance, InPD,
InDevice, InSDKVersion, InFeatureInfo);
InDevice, InSDKVersion, &localFeatureInfo);
LOG_INFO("NVNGXProxy::VULKAN_Init_Ext result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -188,9 +285,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_Ext(unsigned long long InAp
DLSSGMod::InitDLSSGMod_Vulkan();
DLSSGMod::VULKAN_Init_Ext(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice, InSDKVersion,
InFeatureInfo);
&localFeatureInfo);
ScopedInit scopedInit {};
ScopedInitVk scopedInit {};
return NVSDK_NGX_VULKAN_Init_Ext2(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice,
vkGetInstanceProcAddr, vkGetDeviceProcAddr, InSDKVersion, InFeatureInfo);
}
@@ -203,6 +300,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (NVNGXProxy::NVNGXModule() == nullptr)
@@ -213,7 +316,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
LOG_INFO("calling NVNGXProxy::VULKAN_Init_ProjectID_Ext");
auto result = NVNGXProxy::VULKAN_Init_ProjectID_Ext()(InProjectId, InEngineType, InEngineVersion,
InApplicationDataPath, InInstance, InPD, InDevice,
InGIPA, InGDPA, InSDKVersion, InFeatureInfo);
InGIPA, InGDPA, InSDKVersion, &localFeatureInfo);
LOG_INFO("NVNGXProxy::VULKAN_Init_ProjectID_Ext result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -221,9 +324,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init_ProjectID_Ext(
}
}
ScopedInit scopedInit {};
ScopedInitVk scopedInit {};
auto result = NVSDK_NGX_VULKAN_Init_Ext2(0x1337, InApplicationDataPath, InInstance, InPD, InDevice, InGIPA, InGDPA,
InSDKVersion, InFeatureInfo);
InSDKVersion, &localFeatureInfo);
LOG_DEBUG("InProjectId: {0}", InProjectId);
LOG_DEBUG("InEngineType: {0}", (int) InEngineType);
@@ -245,6 +348,12 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init(unsigned long long InApplic
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -257,7 +366,7 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init(unsigned long long InApplic
{
LOG_INFO("calling NVNGXProxy::VULKAN_Init");
auto result = NVNGXProxy::VULKAN_Init()(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice,
InGIPA, InGDPA, InFeatureInfo, InSDKVersion);
InGIPA, InGDPA, &localFeatureInfo, InSDKVersion);
LOG_INFO("NVNGXProxy::VULKAN_Init result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -267,9 +376,9 @@ NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_Init(unsigned long long InApplic
DLSSGMod::InitDLSSGMod_Vulkan();
DLSSGMod::VULKAN_Init(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice, InGIPA, InGDPA,
InFeatureInfo, InSDKVersion);
&localFeatureInfo, InSDKVersion);
ScopedInit scopedInit {};
ScopedInitVk scopedInit {};
return NVSDK_NGX_VULKAN_Init_Ext2(InApplicationId, InApplicationDataPath, InInstance, InPD, InDevice, InGIPA,
InGDPA, InSDKVersion, InFeatureInfo);
}
@@ -282,6 +391,12 @@ NVSDK_NGX_VULKAN_Init_ProjectID(const char* InProjectId, NVSDK_NGX_EngineType In
{
LOG_FUNC();
NVSDK_NGX_FeatureCommonInfo localFeatureInfo = {};
std::memcpy(&localFeatureInfo, InFeatureInfo, sizeof(NVSDK_NGX_FeatureCommonInfo));
if (!_skipInit)
UpdateInitPaths(&localFeatureInfo);
if (Config::Instance()->DLSSEnabled.value_or_default() && !_skipInit)
{
if (Config::Instance()->UseGenericAppIdWithDlss.value_or_default())
@@ -295,7 +410,7 @@ NVSDK_NGX_VULKAN_Init_ProjectID(const char* InProjectId, NVSDK_NGX_EngineType In
LOG_INFO("calling NVNGXProxy::VULKAN_Init_ProjectID");
auto result = NVNGXProxy::VULKAN_Init_ProjectID()(InProjectId, InEngineType, InEngineVersion,
InApplicationDataPath, InInstance, InPD, InDevice, InGIPA,
InGDPA, InSDKVersion, InFeatureInfo);
InGDPA, InSDKVersion, &localFeatureInfo);
LOG_INFO("NVNGXProxy::VULKAN_Init_ProjectID result: {0:X}", (UINT) result);
if (result == NVSDK_NGX_Result_Success)
@@ -303,9 +418,10 @@ NVSDK_NGX_VULKAN_Init_ProjectID(const char* InProjectId, NVSDK_NGX_EngineType In
}
}
ScopedInit scopedInit {};
ScopedInitVk scopedInit {};
return NVSDK_NGX_VULKAN_Init_ProjectID_Ext(InProjectId, InEngineType, InEngineVersion, InApplicationDataPath,
InInstance, InPD, InDevice, InGIPA, InGDPA, InSDKVersion, InFeatureInfo);
InInstance, InPD, InDevice, InGIPA, InGDPA, InSDKVersion,
&localFeatureInfo);
}
NVSDK_NGX_API NVSDK_NGX_Result NVSDK_NGX_VULKAN_GetParameters(NVSDK_NGX_Parameter** OutParameters)