Skip to content

Fix build, update to work with latest DLSS SDK #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ernie wants to merge 1 commit into
base: quake
Choose a base branch
from
Open

Fix build, update to work with latest DLSS SDK #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ if (RG_WITH_NVIDIA_DLSS)
add_definitions(-DNV_WINDOWS)
string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE )
if (BUILD_TYPE STREQUAL "DEBUG")
target_link_libraries(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d_dbg.lib")
target_link_libraries(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/lib/Windows_x86_64/x64/nvsdk_ngx_d_dbg.lib")
else()
target_link_libraries(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d.lib")
target_link_libraries(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/lib/Windows_x86_64/x64/nvsdk_ngx_d.lib")
endif()
else()
target_link_libraries(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/lib/Linux_x86_64/libnvsdk_ngx.a")
Expand Down
21 changes: 16 additions & 5 deletions Source/DLSS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ bool RTGL1::DLSS::TryInit(VkInstance instance, VkDevice device, VkPhysicalDevice
pathsInfo.Path = &dllPath_c;
pathsInfo.Length = 1;

NGSDK_NGX_LoggingInfo debugLogInfo = {};
NVSDK_NGX_LoggingInfo debugLogInfo = {};
debugLogInfo.LoggingCallback = &PrintCallback;
debugLogInfo.MinimumLoggingLevel = NVSDK_NGX_Logging_Level::NVSDK_NGX_LOGGING_LEVEL_ON;

NGSDK_NGX_LoggingInfo releaseLogInfo = {};
NVSDK_NGX_LoggingInfo releaseLogInfo = {};

NVSDK_NGX_FeatureCommonInfo commonInfo = {};
commonInfo.PathListInfo = pathsInfo;
Expand All @@ -122,9 +122,20 @@ bool RTGL1::DLSS::TryInit(VkInstance instance, VkDevice device, VkPhysicalDevice
throw RgException(RG_WRONG_ARGUMENT, "Provided application GUID is not GUID. Generate and specify correct GUID to use DLSS.");
}

// Fix: Pass nullptr for PFN_vkGetInstanceProcAddr and PFN_vkGetDeviceProcAddr, then pass &commonInfo as the 10th argument
r = NVSDK_NGX_VULKAN_Init_with_ProjectID(
pAppGuid,
NVSDK_NGX_EngineType::NVSDK_NGX_ENGINE_TYPE_CUSTOM, RG_RTGL_VERSION_API, L"DLSSTemp/", instance, physDevice, device, &commonInfo);
NVSDK_NGX_EngineType::NVSDK_NGX_ENGINE_TYPE_CUSTOM,
RG_RTGL_VERSION_API,
L"DLSSTemp/",
instance,
physDevice,
device,
nullptr, // PFN_vkGetInstanceProcAddr
nullptr, // PFN_vkGetDeviceProcAddr
&commonInfo, // const NVSDK_NGX_FeatureCommonInfo *
NVSDK_NGX_Version_API
);

if (NVSDK_NGX_FAILED(r))
{
Expand All @@ -134,7 +145,7 @@ bool RTGL1::DLSS::TryInit(VkInstance instance, VkDevice device, VkPhysicalDevice
r = NVSDK_NGX_VULKAN_GetCapabilityParameters(&pParams);
if (NVSDK_NGX_FAILED(r))
{
NVSDK_NGX_VULKAN_Shutdown();
NVSDK_NGX_VULKAN_Shutdown1(nullptr);
pParams = nullptr;

return false;
Expand Down Expand Up @@ -229,7 +240,7 @@ void RTGL1::DLSS::Destroy()
}

NVSDK_NGX_VULKAN_DestroyParameters(pParams);
NVSDK_NGX_VULKAN_Shutdown();
NVSDK_NGX_VULKAN_Shutdown1(nullptr);

pParams = nullptr;
isInitialized = false;
Expand Down