From 2730711c46bc04f744ad6c573287b8987e8223fc Mon Sep 17 00:00:00 2001 From: Vasilii Shirokii Date: Fri, 9 Aug 2024 11:46:04 +0100 Subject: [PATCH] Remove native DLSS from a standalone build, use Streamline --- CMakeLists.txt | 3 ++- CMakeSettings.json | 4 ++-- Source/DLSS2.cpp | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91dde220..28dcfcdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,7 @@ option(RG_WITH_SURFACE_XLIB "Build with Xlib VkSurfaceKHR support" OFF) option(RG_WITH_IMGUI "Build RTGL1 with ImGui debug windows" ON) option(RG_WITH_DX12 "Build RTGL1 with DX12 features" ON) +option(RG_WITH_NATIVE_DLSS "Build RTGL1 with native DLSS2" ON) option(RG_WITH_EXAMPLES "Build with examples executable" ON) @@ -253,7 +254,7 @@ target_include_directories(RayTracedGL1 PRIVATE "Source/KTX/include" "Source/KTX # DLSS target_include_directories(RayTracedGL1 PRIVATE "Source/Streamline/include") -if (DEFINED ENV{DLSS_SDK_PATH}) +if (RG_WITH_NATIVE_DLSS AND DEFINED ENV{DLSS_SDK_PATH}) message(STATUS "Found Native DLSS SDK: $ENV{DLSS_SDK_PATH}") target_include_directories(RayTracedGL1 PRIVATE "$ENV{DLSS_SDK_PATH}/include") add_definitions(-DRG_USE_NATIVE_DLSS2) diff --git a/CMakeSettings.json b/CMakeSettings.json index c45e64ce..0d29420a 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -50,8 +50,8 @@ "type": "BOOL" }, { - "name": "RG_WITH_NVIDIA_DLSS", - "value": "true", + "name": "RG_WITH_NATIVE_DLSS", + "value": "False", "type": "BOOL" } ] diff --git a/Source/DLSS2.cpp b/Source/DLSS2.cpp index a84f38ed..d32144c0 100644 --- a/Source/DLSS2.cpp +++ b/Source/DLSS2.cpp @@ -614,8 +614,7 @@ auto RTGL1::DLSS2::RequiredVulkanExtensions_Device( VkPhysicalDevice physDevice RTGL1::DLSS2::DLSS2( VkInstance instance, VkDevice device, VkPhysicalDevice physDevice, - const char* pAppGuid, - bool enableDebug ) + const char* pAppGuid ) { }