Browse Source

Add devel DLSS library

Panagiotis Christopoulos Charitos 3 years ago
parent
commit
3edf138336

+ 1 - 1
AnKi/Renderer/Scale.cpp

@@ -198,7 +198,7 @@ void Scale::populateRenderGraph(RenderingContext& ctx)
 
 
 		ComputeRenderPassDescription& pass = ctx.m_renderGraphDescr.newComputeRenderPass("DLSS");
 		ComputeRenderPassDescription& pass = ctx.m_renderGraphDescr.newComputeRenderPass("DLSS");
 
 
-		// TODO: No idea about the usage flags
+		// DLSS says input textures in sampled state and out as storage image
 		const TextureUsageBit readUsage = TextureUsageBit::ALL_SAMPLED & TextureUsageBit::ALL_COMPUTE;
 		const TextureUsageBit readUsage = TextureUsageBit::ALL_SAMPLED & TextureUsageBit::ALL_COMPUTE;
 		const TextureUsageBit writeUsage = TextureUsageBit::ALL_IMAGE & TextureUsageBit::ALL_COMPUTE;
 		const TextureUsageBit writeUsage = TextureUsageBit::ALL_IMAGE & TextureUsageBit::ALL_COMPUTE;
 
 

+ 3 - 2
ThirdParty/DlssSdk/CMakeLists.txt

@@ -6,13 +6,14 @@ if(ANKI_DLSS)
 		add_library(AnKiNgx IMPORTED SHARED GLOBAL)
 		add_library(AnKiNgx IMPORTED SHARED GLOBAL)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-		set_target_properties(AnKiNgx PROPERTIES IMPORTED_IMPLIB_DEBUG ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d_dbg.lib)
+		set_target_properties(AnKiNgx PROPERTIES IMPORTED_IMPLIB_DEBUG ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d_dbg_iterator0.lib)
 		set_target_properties(AnKiNgx PROPERTIES IMPORTED_IMPLIB_RELEASE ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d.lib)
 		set_target_properties(AnKiNgx PROPERTIES IMPORTED_IMPLIB_RELEASE ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d.lib)
 		set_target_properties(AnKiNgx PROPERTIES
 		set_target_properties(AnKiNgx PROPERTIES
 			MAP_IMPORTED_CONFIG_MINSIZEREL Release
 			MAP_IMPORTED_CONFIG_MINSIZEREL Release
 			MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
 			MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
 		)
 		)
-		set_target_properties(AnKiNgx PROPERTIES IMPORTED_LOCATION "${NGX_SDK_ROOT}/lib/Windows_x86_64/rel/nvngx_dlss.dll")
+		set_target_properties(AnKiNgx PROPERTIES IMPORTED_LOCATION
+			"${NGX_SDK_ROOT}/lib/Windows_x86_64/$<IF:$<CONFIG:Debug>,dev,rel>/nvngx_dlss.dll")
 	elseif(LINUX)
 	elseif(LINUX)
 		add_library(AnKiNgx IMPORTED STATIC GLOBAL)
 		add_library(AnKiNgx IMPORTED STATIC GLOBAL)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 		set_property(TARGET AnKiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

BIN
ThirdParty/DlssSdk/sdk/lib/Windows_x86_64/dev/nvngx_dlss.dll