- Remove unused libraries

- Style guide corrections
- Cmake cleanup

AnKi/Gr/CMakeLists.txt

@@ -139,28 +139,5 @@ target_link_libraries(AnKiGrCommon AnKiUtil) # Only depend on Util
 add_library(AnKiGr ${backend_sources} ${backend_headers})
 target_compile_definitions(AnKiGr PRIVATE -DANKI_SOURCE_FILE)
 target_link_libraries(AnKiGr AnKiCore AnKiSpirvCross AnKiGrCommon)
-
-# Copy required DLLs
-if(DLSS_SUPPORT)
-	get_target_property(lib_type AnkiNgx TYPE)
-    if ("${lib_type}" STREQUAL "SHARED_LIBRARY")
-		get_target_property(ANKINGX_DLL AnkiNgx IMPORTED_LOCATION)
-		add_custom_command(TARGET AnKiGr
-			COMMENT "Dependant DLLs copy ${ANKINGX_DLL} ${CMAKE_BINARY_DIR}/Bin"
-			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ANKINGX_DLL}" "${CMAKE_BINARY_DIR}/Bin")
-		STRING(REGEX REPLACE "\\\\" "/" ANKINGX_DLL ${ANKINGX_DLL})
-		install(FILES ${ANKINGX_DLL} DESTINATION ${CMAKE_INSTALL_BINDIR})
-	else()
-		get_property(__NGX_DLLS_LIST TARGET AnkiNgx PROPERTY EXTRA_DLLS)
-		foreach(dll_path ${__NGX_DLLS_LIST})
-			file(GLOB dll_files "${dll_path}")
-			foreach(dll_file ${dll_files})
-				add_custom_command(TARGET AnKiGr
-					COMMENT "NGX DLL copy ${dll_file} ${CMAKE_BINARY_DIR}/Bin\n"
-					COMMAND ${CMAKE_COMMAND} -E copy_if_different "${dll_file}" "${CMAKE_BINARY_DIR}/Bin")
-				STRING(REGEX REPLACE "\\\\" "/" dll_file ${dll_file})
-				install(FILES ${dll_file} DESTINATION ${CMAKE_INSTALL_BINDIR})
-			endforeach()
-		endforeach()
-	endif()
-endif()
+# Add dynamic dependencies for AnkiNgx
+add_AnkiNgx_dependencies(AnKiGr)

AnKi/Renderer/DownscaleBlur.cpp

@@ -90,7 +90,7 @@ void DownscaleBlur::populateRenderGraph(RenderingContext& ctx)
 	static const Array<CString, 8> passNames = {"DownBlur #0",  "Down/Blur #1", "Down/Blur #2", "Down/Blur #3",
 												"Down/Blur #4", "Down/Blur #5", "Down/Blur #6", "Down/Blur #7"};
 
-	RenderTargetHandle srcTarget =
+	const RenderTargetHandle srcTarget =
 		m_r->getUsingDLSS() ? m_r->getLightShading().getRt() : m_r->getTemporalAA().getHdrRt();
 
 	if(getConfig().getRPreferCompute())

AnKi/Renderer/Scale.cpp

@@ -45,7 +45,7 @@ Error Scale::init()
 	const Bool preferCompute = getConfig().getRPreferCompute();
 	const U32 fsrQuality = getConfig().getRFsr();
 	// Dlss and FSR are mutually exclusive
-	Bool useDlss = m_r->getUsingDLSS();
+	const Bool useDlss = m_r->getUsingDLSS();
 	m_fsr = (fsrQuality != 0) && !useDlss;
 
 	// Program

AnKi/Renderer/VrsSriGeneration.cpp

@@ -152,7 +152,7 @@ void VrsSriGeneration::populateRenderGraph(RenderingContext& ctx)
 		ComputeRenderPassDescription& pass = rgraph.newComputeRenderPass("VRS SRI generation");
 
 		pass.newDependency(RenderPassDependency(m_runCtx.m_rt, TextureUsageBit::IMAGE_COMPUTE_WRITE));
-		Bool useTonemappedRT = !m_r->getUsingDLSS();
+		const Bool useTonemappedRT = !m_r->getUsingDLSS();
 		pass.newDependency(RenderPassDependency(useTonemappedRT ? m_r->getTemporalAA().getTonemappedRt()
 																: m_r->getLightShading().getRt(),
 												TextureUsageBit::SAMPLED_COMPUTE));
@@ -162,7 +162,7 @@ void VrsSriGeneration::populateRenderGraph(RenderingContext& ctx)
 
 			cmdb->bindShaderProgram(m_grProg);
 
-			Bool useTonemappedRT = !m_r->getUsingDLSS();
+			const Bool useTonemappedRT = !m_r->getUsingDLSS();
 			rgraphCtx.bindColorTexture(
 				0, 0, useTonemappedRT ? m_r->getTemporalAA().getTonemappedRt() : m_r->getLightShading().getRt());
 

CMakeLists.txt

@@ -34,6 +34,34 @@ macro(anki_new_executable)
 	endif()
 endmacro()
 
+macro(add_AnkiNgx_dependencies)
+    if(DLSS_SUPPORT)
+        # Copy required DLLs
+        get_target_property(lib_type AnkiNgx TYPE)
+        if ("${lib_type}" STREQUAL "SHARED_LIBRARY")
+            get_target_property(ANKINGX_DLL AnkiNgx IMPORTED_LOCATION)
+            add_custom_command(TARGET ${ARGV}
+                COMMENT "Dependant DLLs copy ${ANKINGX_DLL} ${CMAKE_BINARY_DIR}/Bin"
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different "${ANKINGX_DLL}" "${CMAKE_BINARY_DIR}/Bin")
+            STRING(REGEX REPLACE "\\\\" "/" ANKINGX_DLL ${ANKINGX_DLL})
+            install(FILES ${ANKINGX_DLL} DESTINATION ${CMAKE_INSTALL_BINDIR})
+        else()
+            get_property(__NGX_DLLS_LIST TARGET AnkiNgx PROPERTY EXTRA_DLLS)
+            foreach(dll_path ${__NGX_DLLS_LIST})
+                file(GLOB dll_files "${dll_path}")
+                foreach(dll_file ${dll_files})
+                    add_custom_command(TARGET ${ARGV}
+                        COMMENT "NGX DLL copy ${dll_file} ${CMAKE_BINARY_DIR}/Bin\n"
+                        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${dll_file}" "${CMAKE_BINARY_DIR}/Bin")
+                    STRING(REGEX REPLACE "\\\\" "/" dll_file ${dll_file})
+                    install(FILES ${dll_file} DESTINATION ${CMAKE_INSTALL_BINDIR})
+                endforeach()
+            endforeach()
+        endif()
+    endif()
+
+endmacro()
+
 ################################################################################
 # Determin the system to build for. Do that first                              #
 ################################################################################

ThirdParty/nvngx_dlss_sdk/CMakeLists.txt

@@ -1,36 +1,30 @@
-if (WIN32)
-    set(NGX_USE_STATIC_MSVCRT OFF CACHE BOOL "[Deprecated?]Use NGX libs with static VC runtime (/MT), otherwise dynamic (/MD)")
+# Create AnkiNgx
+if(DLSS_SUPPORT)
     set(NGX_SDK_ROOT "${CMAKE_CURRENT_LIST_DIR}/sdk")
 
-    add_library(AnkiNgx IMPORTED SHARED GLOBAL)
-
-    set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    if(NGX_USE_STATIC_MSVCRT) 
-        set_target_properties(AnkiNgx PROPERTIES IMPORTED_IMPLIB_DEBUG ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_s_dbg.lib)
-        set_target_properties(AnkiNgx PROPERTIES IMPORTED_IMPLIB_RELEASE ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_s.lib)
-    else()
-        set_target_properties(AnkiNgx PROPERTIES IMPORTED_IMPLIB_DEBUG ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d_dbg.lib)
+    if (WIN32)
+        add_library(AnkiNgx IMPORTED SHARED GLOBAL)
+        set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+        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.lib)
         set_target_properties(AnkiNgx PROPERTIES IMPORTED_IMPLIB_RELEASE ${NGX_SDK_ROOT}/lib/Windows_x86_64/x86_64/nvsdk_ngx_d.lib)
-    endif()
-    set_target_properties(AnkiNgx PROPERTIES
-    MAP_IMPORTED_CONFIG_MINSIZEREL Release
-    MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
-    )
+        set_target_properties(AnkiNgx PROPERTIES
+            MAP_IMPORTED_CONFIG_MINSIZEREL Release
+            MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
+        )
+        set_target_properties(AnkiNgx PROPERTIES IMPORTED_LOCATION "${NGX_SDK_ROOT}/lib/Windows_x86_64/rel/nvngx_dlss.dll")
+    else ()
+        add_library(AnkiNgx IMPORTED STATIC GLOBAL)
 
-    # TODO: DO NOT USE/PUSH THE DEV DLLs 
-    set_target_properties(AnkiNgx PROPERTIES IMPORTED_LOCATION "${NGX_SDK_ROOT}/lib/Windows_x86_64/rel/nvngx_dlss.dll")
-else ()
-    add_library(AnkiNgx IMPORTED STATIC GLOBAL)
+        set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+        set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(AnkiNgx PROPERTIES IMPORTED_LOCATION ${NGX_SDK_ROOT}/lib/Linux_x86_64/libnvsdk_ngx.a)
 
-    set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
-    set_property(TARGET AnkiNgx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-    set_target_properties(AnkiNgx PROPERTIES IMPORTED_LOCATION ${NGX_SDK_ROOT}/lib/Linux_x86_64/libnvsdk_ngx.a)
-
-    # set the list of DLLs that need copying to target folder of application
-    set(__NGX_DLLS_LIST "${NGX_SDK_ROOT}/lib/Linux_x86_64/rel/libnvidia-ngx-*.so.*")
-endif()
+        # set the list of DLLs that need copying to target folder of application
+        set(__NGX_DLLS_LIST "${NGX_SDK_ROOT}/lib/Linux_x86_64/rel/libnvidia-ngx-*.so.*")
+    endif()
 
-set_property(TARGET AnkiNgx APPEND PROPERTY EXTRA_DLLS "${__NGX_DLLS_LIST}")
+    set_property(TARGET AnkiNgx APPEND PROPERTY EXTRA_DLLS "${__NGX_DLLS_LIST}")
 
-target_include_directories(AnkiNgx INTERFACE ${NGX_SDK_ROOT}/include)
+    target_include_directories(AnkiNgx INTERFACE ${NGX_SDK_ROOT}/include)
+endif()