Sync with "simplex"

Author: dzhdanNV

3-PrepareSDK.bat

@@ -1,56 +1,4 @@
 @echo off
 
-set ROOT=%cd%
-set NRD=%ROOT%\External\NRD
-set NRI=%ROOT%\External\NRIFramework\External\NRI
-
-rd /q /s "_NRD_SDK"
-mkdir "_NRD_SDK"
-cd "_NRD_SDK"
-
-mkdir "Include"
-mkdir "Integration"
-mkdir "Lib\Debug"
-mkdir "Lib\Release"
-mkdir "Shaders"
-
-copy "%NRD%\Include\*" "Include"
-copy "%NRD%\Integration\*" "Integration"
-copy "%NRD%\Shaders\NRD.hlsli" "Shaders"
-copy "%NRD%\Shaders\NRDConfig.hlsli" "Shaders"
-copy "%NRD%\LICENSE.txt" "."
-copy "%NRD%\README.md" "."
-copy "%NRD%\UPDATE.md" "."
-
-copy "%ROOT%\_Bin\Debug\NRD.dll" "Lib\Debug"
-copy "%ROOT%\_Bin\Debug\NRD.lib" "Lib\Debug"
-copy "%ROOT%\_Bin\Debug\NRD.pdb" "Lib\Debug"
-copy "%ROOT%\_Bin\Release\NRD.dll" "Lib\Release"
-copy "%ROOT%\_Bin\Release\NRD.lib" "Lib\Release"
-copy "%ROOT%\_Bin\Release\NRD.pdb" "Lib\Release"
-
-cd ..
-
-rd /q /s "_NRI_SDK"
-mkdir "_NRI_SDK"
-cd "_NRI_SDK"
-
-mkdir "Include\Extensions"
-mkdir "Lib\Debug"
-mkdir "Lib\Release"
-
-copy "%NRI%\Include\*" "Include"
-copy "%NRI%\Include\Extensions\*" "Include\Extensions"
-copy "%NRI%\LICENSE.txt" "."
-copy "%NRI%\README.md" "."
-copy "%NRI%\nri.natvis" "."
-
-copy "%ROOT%\_Bin\Debug\NRI.dll" "Lib\Debug"
-copy "%ROOT%\_Bin\Debug\NRI.lib" "Lib\Debug"
-copy "%ROOT%\_Bin\Debug\NRI.pdb" "Lib\Debug"
-copy "%ROOT%\_Bin\Release\NRI.dll" "Lib\Release"
-copy "%ROOT%\_Bin\Release\NRI.lib" "Lib\Release"
-copy "%ROOT%\_Bin\Release\NRI.pdb" "Lib\Release"
-
-cd ..
-
+call "External\NRD\3-PrepareSDK.bat"
+call "External\NRIFramework\External\NRI\3-PrepareSDK.bat"

3-PrepareSDK.sh

@@ -1,46 +1,4 @@
 #!/bin/bash
 
-ROOT=$(pwd)
-NRD=$(ROOT)/External/NRD
-NRI=$(ROOT)/External/NRIFramework/External/NRI
-
-rm -rf "_NRD_SDK"
-mkdir -p "_NRD_SDK"
-cd "_NRD_SDK"
-
-mkdir -p "Include"
-mkdir -p "Integration"
-mkdir -p "Lib/Debug"
-mkdir -p "Lib/Release"
-mkdir -p "Shaders"
-
-cp -r "$(NRD)/Include/" "Include"
-cp -r "$(NRD)/Integration/" "Integration"
-cp -r "$(NRD)/Shaders/NRD.hlsli" "Shaders"
-cp -r "$(NRD)/Shaders/NRDConfig.hlsli" "Shaders"
-cp "$(NRD)/LICENSE.txt" "."
-cp "$(NRD)/README.md" "."
-cp "$(NRD)/UPDATE.md" "."
-
-cp -H "$(ROOT)/_Bin/Debug/libNRD.so" "Lib/Debug"
-cp -H "$(ROOT)/_Bin/Release/libNRD.so" "Lib/Release"
-
-cd ..
-
-rm -rf "_NRI_SDK"
-mkdir -p "_NRI_SDK"
-cd "_NRI_SDK"
-
-mkdir -p "Include"
-mkdir -p "Lib/Debug"
-mkdir -p "Lib/Release"
-
-cp -r "$(NRI)/Include/" "Include"
-cp "$(NRI)/LICENSE.txt" "."
-cp "$(NRI)/README.md" "."
-cp "$(NRI)/nri.natvis" "."
-
-cp -H "$(ROOT)/_Bin/Debug/libNRI.so" "Lib/Debug"
-cp -H "$(ROOT)/_Bin/Release/libNRI.so" "Lib/Release"
-
-cd ..
+bash "External/NRD/3-PrepareSDK.sh"
+bash "External/NRIFramework/External/NRI/3-PrepareSDK.sh"

CMakeLists.txt

@@ -87,7 +87,7 @@ fetchcontent_declare(
     DOWNLOAD_EXTRACT_TIMESTAMP 1
     DOWNLOAD_NO_PROGRESS 1
     SOURCE_SUBDIR "ignore CMakeLists.txt"
-    URL https://github.com/NVIDIA-RTX/SHARC/archive/6893c9af2a16df07de0cd1b70a85404e2f8fc5e8.zip
+    URL https://github.com/NVIDIA-RTX/SHARC/archive/76238ef61abc67cd7ab29ea8a763e3226adc5ca5.zip
 )
 list(APPEND DEPS sharc)
 

External/NRD

@@ -1,6 +1,7 @@
 // © 2022 NVIDIA Corporation
 
 #include "Include/Shared.hlsli"
+#include "Include/RaytracingShared.hlsli"
 
 // Inputs
 NRI_RESOURCE( Texture2D<float>, gIn_ViewZ, t, 0, SET_OTHER );
@@ -22,7 +23,7 @@ NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float3>, gOut_ComposedDiff, u, 0
 NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float4>, gOut_ComposedSpec_ViewZ, u, 1, SET_OTHER );
 
 [numthreads( 16, 16, 1 )]
-void main( int2 pixelPos : SV_DispatchThreadId )
+void main( int2 pixelPos : SV_DispatchThreadID )
 {
     float2 pixelUv = float2( pixelPos + 0.5 ) * gInvRectSize;
 
@@ -67,10 +68,6 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         Ldirect = Ldirect * shadow + Lemi;
 
     // G-buffer
-    float3 albedo, Rf0;
-    float4 baseColorMetalness = gIn_BaseColor_Metalness[ pixelPos ];
-    BRDF::ConvertBaseColorMetalnessToAlbedoRf0( baseColorMetalness.xyz, baseColorMetalness.w, albedo, Rf0 );
-
     float3 Xv = Geometry::ReconstructViewPosition( pixelUv, gCameraFrustum, viewZ, gOrthoMode );
     float3 V = gOrthoMode == 0 ? normalize( Geometry::RotateVector( gViewToWorld, 0 - Xv ) ) : gViewDirection.xyz;
 
@@ -79,8 +76,8 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     float4 spec = gIn_Spec[ pixelPos ];
 
     #if( NRD_MODE == SH )
-        float4 diff1 = gIn_DiffSh[ pixelPos ];
-        float4 spec1 = gIn_SpecSh[ pixelPos ];
+        float3 diff1 = gIn_DiffSh[ pixelPos ].xyz;
+        float3 spec1 = gIn_SpecSh[ pixelPos ].xyz;
     #endif
 
     // Decode SH mode outputs
@@ -178,15 +175,13 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     }
 
     // Material modulation ( convert radiance back into irradiance )
-    float3 diffFactor, specFactor;
-    NRD_MaterialFactors( N, V, albedo, Rf0, roughness, diffFactor, specFactor );
+    float4 baseColorMetalness = gIn_BaseColor_Metalness[ pixelPos ];
 
-    // We can combine radiance ( for everything ) and irradiance ( for hair ) in denoising if material ID test is enabled
-    if( materialID == MATERIAL_ID_HAIR )
-    {
-        diffFactor = 1.0;
-        specFactor = 1.0;
-    }
+    float3 albedo, Rf0;
+    BRDF::ConvertBaseColorMetalnessToAlbedoRf0( baseColorMetalness.xyz, baseColorMetalness.w, albedo, Rf0 );
+
+    float3 diffFactor, specFactor;
+    GetMaterialFactors( N, V, albedo, Rf0, roughness, materialID == MATERIAL_ID_HAIR, diffFactor, specFactor );
 
     // Composition
     float3 Ldiff = diff.xyz * diffFactor;

External/NRIFramework

@@ -31,7 +31,7 @@ float2 GetGeometryWeightParams( float3 Nv, float3 Xv )
     Math::SmoothStep( 1.0, 0.0, abs( ( x ) * px + py ) )
 
 [numthreads( 16, 16, 1 )]
-void main( uint2 pixelPos : SV_DispatchThreadId )
+void main( uint2 pixelPos : SV_DispatchThreadID )
 {
     float2 pixelUv = ( pixelPos + 0.5 ) * gInvSharcRenderSize;
 

Shaders/Composition.cs.hlsl

@@ -5,7 +5,7 @@
 NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float3>, gOut_Image, u, 0, SET_OTHER );
 
 [numthreads( 16, 16, 1 )]
-void main( uint2 pixelPos : SV_DispatchThreadId )
+void main( uint2 pixelPos : SV_DispatchThreadID )
 {
     float2 pixelUv = float2( pixelPos + 0.5 ) * gInvOutputSize;
 

Shaders/ConfidenceBlur.cs.hlsl

@@ -13,7 +13,7 @@ NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float>, gOut_SpecHitDistance, u,
 NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float4>, gOut_Normal_Roughness, u, 4, SET_OTHER );
 
 [numthreads( 16, 16, 1 )]
-void main( uint2 pixelPos : SV_DispatchThreadId )
+void main( uint2 pixelPos : SV_DispatchThreadID )
 {
     float2 pixelUv = ( float2( pixelPos ) + 0.5 ) * gInvRenderSize;
 

Shaders/DlssAfter.cs.hlsl

@@ -9,7 +9,7 @@ NRI_RESOURCE( Texture2D<float4>, gIn_Validation, t, 2, SET_OTHER );
 NRI_FORMAT("unknown") NRI_RESOURCE( RWTexture2D<float3>, gOut_Final, u, 0, SET_OTHER );
 
 [numthreads( 16, 16, 1 )]
-void main( uint2 pixelPos : SV_DispatchThreadId )
+void main( uint2 pixelPos : SV_DispatchThreadID )
 {
     float2 pixelUv = float2( pixelPos + 0.5 ) * gInvOutputSize;