NRD updated to v4.2.0:

- PT: better hitT accumulation on emissives
- PT: improved PSR
- PT: improved curvature heuristic for PSR
- PT: added geometry curvature correction by scale
- PT: added optional Russian Roulette usage
- PT: added curvature visualization
- PT: added PSR throughput visualization
- PT: fixed bias in Important Sampling
- PT: fixed glass in ortho mode
- PT: fixed / tuned ambient usage
- PT: fixed / adjusted throughput
- PT: fixed previous frame reuse for specular for low roughness
- PT: fixed MV of dynamic objects in PSR
- PT: fixed prev transform of scaled glass objects
- NRD: anti-firefly enabled in DLSS mode for REBLUR (good cleaner, minimizes confusion cases for DLSS, doesn't add bias)
- UI: highlighted preferred settings
- dropped AssImp
- added Kitchen scene and removed ZeroDay scene
- all assets converted to GLTF
- optimized memory usage a bit
- performance optimizations
- more accurate curvature calculations
- updated README
- updated dependencies
- refactoring

.args

@@ -73,16 +73,16 @@
       "Command": "SCENES",
       "Items": [
         {
-          "Command": "--scene=ShaderBalls/ShaderBalls.obj"
+          "Command": "--scene=ShaderBalls/ShaderBalls.gltf"
         },
         {
-          "Command": "--scene=Bistro/BistroInterior.fbx"
+          "Command": "--scene=Bistro/BistroInterior.gltf"
         },
         {
-          "Command": "--scene=Bistro/BistroExterior.fbx"
+          "Command": "--scene=Bistro/BistroExterior.gltf"
         },
         {
-          "Command": "--scene=ZeroDay/MEASURE_SEVEN/MEASURE_SEVEN.fbx"
+          "Command": "--scene=Kitchen/Kitchen.gltf"
         }
       ]
     },

.gitignore

@@ -47,7 +47,6 @@ compile_commands.json
 *.manifest
 
 # external packages
-External/Assimp/
 External/Detex/
 External/Glfw/
 External/ImGui/

CMakeLists.txt

@@ -45,10 +45,10 @@ endif ()
 message ("Packman platform: ${PACKMAN_PLATFORM}")
 
 if (USE_MINIMAL_DATA)
-    set (NRI_DATA_VERSION 2.0_minimal)
+    set (NRI_DATA_VERSION 2.3_minimal)
     message ("Using minimal '_Data'")
 else ()
-    set (NRI_DATA_VERSION 2.1)
+    set (NRI_DATA_VERSION 2.3)
 endif ()
 
 execute_process (COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/External/Packman/packman${PACKMAN_EXT}" pull "${CMAKE_CURRENT_SOURCE_DIR}/Dependencies.xml" -p ${PACKMAN_PLATFORM} -t nri_data_version=${NRI_DATA_VERSION}

Shaders/Composition.cs.hlsl

@@ -15,17 +15,18 @@ NRI_RESOURCE( Texture2D<float>, gIn_ViewZ, t, 0, 1 );
 NRI_RESOURCE( Texture2D<float4>, gIn_Normal_Roughness, t, 1, 1 );
 NRI_RESOURCE( Texture2D<float4>, gIn_BaseColor_Metalness, t, 2, 1 );
 NRI_RESOURCE( Texture2D<float3>, gIn_DirectLighting, t, 3, 1 );
-NRI_RESOURCE( Texture2D<float3>, gIn_Ambient, t, 4, 1 );
-NRI_RESOURCE( Texture2D<float4>, gIn_Diff, t, 5, 1 );
-NRI_RESOURCE( Texture2D<float4>, gIn_Spec, t, 6, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_PsrThroughput, t, 4, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_Ambient, t, 5, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_Diff, t, 6, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_Spec, t, 7, 1 );
 #if( NRD_MODE == SH )
-    NRI_RESOURCE( Texture2D<float4>, gIn_DiffSh, t, 7, 1 );
-    NRI_RESOURCE( Texture2D<float4>, gIn_SpecSh, t, 8, 1 );
+    NRI_RESOURCE( Texture2D<float4>, gIn_DiffSh, t, 8, 1 );
+    NRI_RESOURCE( Texture2D<float4>, gIn_SpecSh, t, 9, 1 );
 #endif
 
 // Outputs
-NRI_RESOURCE( RWTexture2D<float4>, gOut_ComposedDiff, u, 0, 1 );
-NRI_RESOURCE( RWTexture2D<float4>, gOut_ComposedSpec, u, 1, 1 );
+NRI_RESOURCE( RWTexture2D<float3>, gOut_ComposedDiff, u, 0, 1 );
+NRI_RESOURCE( RWTexture2D<float4>, gOut_ComposedSpec_ViewZ, u, 1, 1 );
 
 [numthreads( 16, 16, 1)]
 void main( int2 pixelPos : SV_DispatchThreadId )
@@ -53,8 +54,8 @@ void main( int2 pixelPos : SV_DispatchThreadId )
 
     if( abs( viewZ ) == INF )
     {
-        gOut_ComposedDiff[ pixelPos ] = float4( Ldirect * float( gOnScreen == SHOW_FINAL ), z );
-        gOut_ComposedSpec[ pixelPos ] = float4( 0, 0, 0, z );
+        gOut_ComposedDiff[ pixelPos ] = Ldirect * float( gOnScreen == SHOW_FINAL );
+        gOut_ComposedSpec_ViewZ[ pixelPos ] = float4( 0, 0, 0, z );
 
         return;
     }
@@ -186,8 +187,8 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     float3 diffDemod = ( 1.0 - Fenv ) * albedo * 0.99 + 0.01;
     float3 specDemod = Fenv * 0.99 + 0.01;
 
-    float3 Ldiff = diff.xyz * ( gReference ? 1.0 : diffDemod );
-    float3 Lspec = spec.xyz * ( gReference ? 1.0 : specDemod );
+    float3 Ldiff = diff.xyz * diffDemod;
+    float3 Lspec = spec.xyz * specDemod;
 
     // Ambient
     float3 ambient = gIn_Ambient.SampleLevel( gLinearSampler, float2( 0.5, 0.5 ), 0 );
@@ -199,8 +200,17 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     Ldiff += ambient * diff.w * ( 1.0 - Fenv ) * albedo;
     Lspec += ambient * spec.w * Fenv * specAmbientAmount;
 
-    // IMPORTANT: we store diffuse and specular separately to be able to use reprojection trick.
-    // Let's assume that direct lighting can always be reprojected as diffuse
+    // Apply PSR throughput ( primary surface material before replacement )
+    #if( USE_PSR == 1 )
+        float3 psrThroughput = gIn_PsrThroughput[ pixelPos ];
+        Ldiff *= psrThroughput;
+        Lspec *= psrThroughput;
+        Ldirect *= psrThroughput;
+    #else
+        float3 psrThroughput = 1.0;
+    #endif
+
+    // IMPORTANT: we store diffuse and specular separately to be able to use the reprojection trick. Let's assume that direct lighting can always be reprojected as diffuse
     Ldiff += Ldirect;
 
     // Debug
@@ -222,10 +232,12 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         Ldiff = baseColorMetalness.w;
     else if( gOnScreen == SHOW_WORLD_UNITS )
         Ldiff = frac( X * gUnitToMetersMultiplier );
+    else if( gOnScreen == SHOW_PSR_THROUGHPUT )
+        Ldiff = psrThroughput;
     else if( gOnScreen != SHOW_FINAL )
         Ldiff = gOnScreen == SHOW_MIP_SPECULAR ? spec.xyz : Ldirect.xyz;
 
     // Output
-    gOut_ComposedDiff[ pixelPos ] = float4( Ldiff, z );
-    gOut_ComposedSpec[ pixelPos ] = float4( Lspec, z );
+    gOut_ComposedDiff[ pixelPos ] = Ldiff;
+    gOut_ComposedSpec_ViewZ[ pixelPos ] = float4( Lspec, z );
 }

Shaders/DeltaRays.cs.hlsl

@@ -13,8 +13,8 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
 
 // Inputs
 NRI_RESOURCE( Texture2D<float>, gIn_ViewZ, t, 0, 1 );
-NRI_RESOURCE( Texture2D<float4>, gIn_Diff_ViewZ, t, 1, 1 );
-NRI_RESOURCE( Texture2D<float4>, gIn_Spec_ViewZ, t, 2, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_ComposedDiff, t, 1, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_ComposedSpec_ViewZ, t, 2, 1 );
 NRI_RESOURCE( Texture2D<float3>, gIn_Ambient, t, 3, 1 );
 
 // Outputs
@@ -54,18 +54,18 @@ float3 TraceTransparent( TraceTransparentDesc desc )
     float eta = STL::BRDF::IOR::Air / STL::BRDF::IOR::Glass;
 
     GeometryProps geometryProps = desc.geometryProps;
-    float transmittance = 1.0;
+    float pathThroughput = 1.0;
     bool isReflection = desc.isReflection;
 
     [loop]
-    for( uint bounce = 1; bounce <= desc.bounceNum; bounce++ ) // TODO: stop if transmittance is low
+    for( uint bounce = 1; bounce <= desc.bounceNum; bounce++ ) // TODO: stop if pathThroughput is low
     {
         // Reflection or refraction?
         float NoV = abs( dot( geometryProps.N, geometryProps.V ) );
         float F = STL::BRDF::FresnelTerm_Dielectric( eta, NoV );
 
         if( bounce == 1 )
-            transmittance *= isReflection ? F : 1.0 - F;
+            pathThroughput *= isReflection ? F : 1.0 - F;
         else
             isReflection = STL::Rng::Hash::GetFloat( ) < F;
 
@@ -94,7 +94,7 @@ float3 TraceTransparent( TraceTransparentDesc desc )
         // TODO: glass internal extinction?
         // ideally each "medium" should have "eta" and "extinction" parameters in "TraceTransparentDesc" and "TraceOpaqueDesc"
         if( !isReflection )
-            transmittance *= 0.96;
+            pathThroughput *= 0.96;
 
         // Is opaque hit found?
         if( !geometryProps.IsTransparent( ) )
@@ -111,16 +111,17 @@ float3 TraceTransparent( TraceTransparentDesc desc )
             // Ambient estimation at the end of the path
             float3 BRDF = GetAmbientBRDF( geometryProps, materialProps );
             BRDF *= 1.0 + EstimateDiffuseProbability( geometryProps, materialProps, true );
+
             L += desc.Lamb * BRDF;
 
             // Previous frame
             float3 prevLdiff, prevLspec;
-            float reprojectionWeight = ReprojectRadiance( false, !isReflection, gIn_Diff_ViewZ, gIn_Spec_ViewZ, geometryProps, desc.pixelPos, prevLdiff, prevLspec );
+            float reprojectionWeight = ReprojectRadiance( false, !isReflection, gIn_ComposedDiff, gIn_ComposedSpec_ViewZ, geometryProps, desc.pixelPos, prevLdiff, prevLspec );
 
             L = lerp( L, prevLdiff + prevLspec, reprojectionWeight );
 
             // Output
-            return L * transmittance;
+            return L * pathThroughput;
         }
     }
 
@@ -150,15 +151,19 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     float viewZ = gIn_ViewZ[ pixelPos ];
     float3 Xv = STL::Geometry::ReconstructViewPosition( sampleUv, gCameraFrustum, viewZ, gOrthoMode );
 
+    // Composed without glass
+    float3 diff = gIn_ComposedDiff[ pixelPos ];
+    float4 spec = gIn_ComposedSpec_ViewZ[ pixelPos ];
+    float3 Lsum = diff + spec.xyz * float( gOnScreen == SHOW_FINAL );
+
     // Primary ray for transparent geometry only
     float3 cameraRayOriginv = STL::Geometry::ReconstructViewPosition( sampleUv, gCameraFrustum, gNearZ, gOrthoMode );
     float3 cameraRayOrigin = STL::Geometry::AffineTransform( gViewToWorld, cameraRayOriginv );
     float3 cameraRayDirection = gOrthoMode == 0 ? normalize( STL::Geometry::RotateVector( gViewToWorld, cameraRayOriginv ) ) : -gViewDirection;
 
-    float tmin0 = length( Xv );
+    float tmin0 = gOrthoMode == 0 ? length( Xv ) : abs( Xv.z );
     GeometryProps geometryPropsT = CastRay( cameraRayOrigin, cameraRayDirection, 0.0, tmin0, GetConeAngleFromRoughness( 0.0, 0.0 ), gWorldTlas, gTransparent == 0.0 ? 0 : GEOMETRY_ONLY_TRANSPARENT, 0 );
 
-    float3 Ltransparent = 0.0;
     if( !geometryPropsT.IsSky( ) && geometryPropsT.tmin < tmin0 )
     {
         // Initialize RNG
@@ -190,23 +195,14 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         // IMPORTANT: use 1 reflection path and 1 refraction path at the primary glass hit to significantly reduce noise
         // TODO: use probabilistic split at the primary glass hit when denoising is available
         desc.isReflection = true;
-        Ltransparent = TraceTransparent( desc );
+        Lsum = TraceTransparent( desc );
 
         desc.isReflection = false;
-        Ltransparent += TraceTransparent( desc );
+        Lsum += TraceTransparent( desc );
     }
 
-    // Composition
-    float4 diff = gIn_Diff_ViewZ[ pixelPos ];
-    float4 spec = gIn_Spec_ViewZ[ pixelPos ] * float( gOnScreen == SHOW_FINAL );
-
-    float3 Lsum = diff.xyz + spec.xyz;
-
-    float mask = dot( Ltransparent, 1.0 );
-    Lsum = mask == 0.0 ? Lsum : Ltransparent;
-
     // Output
-    float z = diff.w;
+    float z = spec.w;
 
     gOut_Composed[ pixelPos ] = float4( Lsum, z );
 }