NRD updated to v4.9.0:

- PT: ambient estimation replaced with SHARC radiance cache - PT: fixed NANs in hair lighting model - PT: added translucency for foliage - PT: hair material ID should not be used for PSRs - PT: various hair rendering improvements (demodulation, animation, BLAS update) - PT: significantly improved ray offsetting - PT: better "normal guide" for hair - PT: hooked up latest NRD features - UI: various improvements - DLSS: added dithering after DLSS - improved TAA - added ability to choose SIGMA variant via a macro switch - fixed hair color space mismatch - history reset related improvements - lots of improvements and bug fixes (nano NRD usage opts, UI, accumulation factors...) - reduced code entropy - updated deps - updated tests - refactoring
NVIDIAGameWorks · Aug 1, 2024 · fc8b3c6 · fc8b3c6
1 parent 2505680
commit fc8b3c6
Show file tree

Hide file tree

Showing 31 changed files with 1,899 additions and 1,502 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,8 @@
 	url = https://github.com/NVIDIA/DLSS.git
 	branch = main
 	update = merge
+[submodule "External/SHARC"]
+	path = External/SHARC
+	url = https://github.com/NVIDIAGameWorks/SHARC.git
+	branch = main
+	update = merge
diff --git a/CLA.txt b/CLA.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,8 +28,6 @@ endif ()
 # Download dependencies using Packman
 if (WIN32)
     set (PACKMAN_EXT ".cmd")
-else()
-    set (PACKMAN_EXT ".sh")
 endif ()
 
 if ((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") OR(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64"))
@@ -168,29 +166,32 @@ set_source_files_properties(${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None")
 set (SHADERMAKE_GENERAL_ARGS
     --useAPI --binary --flatten --stripReflection --WX
     --sourceDir "Shaders"
+    --shaderModel 6_6
     -c Shaders.cfg
     -o "${SHADER_OUTPUT_PATH}"
     -I "Shaders"
     -I "External"
     -I "External/NGX"
     -I "External/NRD/External"
     -I "External/NRIFramework/External/NRI/Include"
+    -I "External/SHARC/Include"
     -D NRD_NORMAL_ENCODING=${NRD_NORMAL_ENCODING}
     -D NRD_ROUGHNESS_ENCODING=${NRD_ROUGHNESS_ENCODING}
+    --sRegShift 100 --tRegShift 200 --bRegShift 300 --uRegShift 400
 )
 
 if (WIN32)
     add_custom_target (${PROJECT_NAME}_Shaders ALL
         COMMAND ShaderMake ${SHADERMAKE_GENERAL_ARGS} -p DXIL --compiler "${DXC_PATH}"
-        COMMAND ShaderMake ${SHADERMAKE_GENERAL_ARGS} -p SPIRV --compiler "${DXC_SPIRV_PATH}" --hlsl2021 --sRegShift 100 --tRegShift 200 --bRegShift 300 --uRegShift 400
+        COMMAND ShaderMake ${SHADERMAKE_GENERAL_ARGS} -p SPIRV --compiler "${DXC_SPIRV_PATH}" --hlsl2021
         DEPENDS ShaderMake
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         VERBATIM
         SOURCES ${SHADERS}
     )
 else ()
     add_custom_target (${PROJECT_NAME}_Shaders ALL
-        COMMAND ShaderMake ${SHADERMAKE_GENERAL_ARGS} -p SPIRV --compiler "${DXC_SPIRV_PATH}" --hlsl2021 --sRegShift 100 --tRegShift 200 --bRegShift 300 --uRegShift 400
+        COMMAND ShaderMake ${SHADERMAKE_GENERAL_ARGS} -p SPIRV --compiler "${DXC_SPIRV_PATH}" --hlsl2021
         DEPENDS ShaderMake
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         VERBATIM

diff --git a/External/NGX b/External/NGX
diff --git a/External/NRD b/External/NRD
diff --git a/External/NRIFramework b/External/NRIFramework
diff --git a/External/SHARC b/External/SHARC
diff --git a/Shaders.cfg b/Shaders.cfg
@@ -3,8 +3,11 @@ DlssAfter.cs.hlsl -T cs
 Composition.cs.hlsl -T cs
 MorphMeshUpdatePrimitives.cs.hlsl -T cs
 MorphMeshUpdateVertices.cs.hlsl -T cs
+SharcClear.cs.hlsl -T cs
+SharcHashCopy.cs.hlsl -T cs
+SharcResolve.cs.hlsl -T cs
+SharcUpdate.cs.hlsl -T cs
 Temporal.cs.hlsl -T cs
-TraceAmbient.cs.hlsl -T cs
 TraceOpaque.cs.hlsl -T cs
 TraceTransparent.cs.hlsl -T cs
 Upsample.cs.hlsl -T cs
+ −		lib/Linux_x86_64/dev/libnvidia-ngx-dlss.so.3.7.10
+ −		lib/Linux_x86_64/libnvsdk_ngx.a
+ −		lib/Linux_x86_64/rel/libnvidia-ngx-dlss.so.3.7.10
+ −		lib/Windows_x86_64/dev/nvngx_dlss.dll
+ −		lib/Windows_x86_64/rel/nvngx_dlss.dll
+1 −6		1-Deploy.sh
+1 −1		2-Build.sh
+1 −1		4-Clean.sh
+0 −149		CLA.txt
+2 −1		CMakeLists.txt
+1 −1		External/Imgui
+1 −1		External/MathLib
+1 −1		External/NRI
+1 −1		External/ShaderMake
+1 −1		Include/Camera.h
+0 −3		Include/Helper.h
+14 −8		Include/NRIFramework.h
+12 −17		Include/Utils.h
+2 −2		Shaders/UI.fs.hlsl
+31 −31		Source/Camera.cpp
+2 −8		Source/DebugAllocator.cpp
+7 −8		Source/SampleBase.cpp
+91 −105		Source/Utils.cpp