NRD updated to v4.3.0:

- PT: hair shading
- PT: optimized instance data
- PT: fixed / improved previous frame reuse
- PT: updated ray offsetting constants
- PT: ignored rays pointing inside the surface
- PT: primary and indirect ray tracing merged into a single pass
- PT: added depth of field
- UI: exposed or changed antilag settings
- added USE_PUDDLES for puddles emulation
- added visualization of "Material ID"
- fixed VK validation errors
- resolution 5120x1440 added to .args
- various convenience changes and bug fixes
- updated tests
- updated dependencies

.args

@@ -30,6 +30,9 @@
         {
           "Command": "--width=3440 --height=1440"
         },
+        {
+          "Command": "--width=5120 --height=1440"
+        },
         {
           "Command": "--width=3840 --height=2160"
         }
@@ -46,6 +49,20 @@
         }
       ]
     },
+    {
+      "Command": "DPI",
+      "Items": [
+        {
+          "Command": "--dpiMode=0"
+        },
+        {
+          "Command": "--dpiMode=1"
+        },
+        {
+          "Command": "--dpiMode=2"
+        }
+      ]
+    },
     {
       "Command": "OTHER",
       "Items": [
@@ -58,9 +75,6 @@
         {
           "Command": "--debugNRD"
         },
-        {
-          "Command": "--ignoreDPI"
-        },
         {
           "Command": "--frameNum=9999999"
         }
@@ -78,6 +92,9 @@
         {
           "Command": "--scene=Bistro/BistroExterior.gltf"
         },
+        {
+          "Command": "--scene=Hair/Hair.gltf"
+        },
         {
           "Command": "--scene=Kitchen/Kitchen.gltf"
         }

1-Deploy.sh

@@ -3,7 +3,6 @@
 git submodule update --init --recursive
 
 chmod +x "External/Packman/packman.sh"
-chmod +x "External/NRIFramework/External/Packman/packman.sh"
 chmod +x "External/NRIFramework/External/NRI/External/Packman/packman.sh"
 chmod +x "2-Build.sh"
 chmod +x "3-Prepare NRD SDK.sh"

3-Run NRD sample.bat

@@ -116,28 +116,28 @@ echo 5 - quality
     goto CHOOSE_DLSS
 
 :SCENE
-set SCENE=Bistro/BistroInterior.fbx
+set SCENE=Bistro\BistroInterior.gltf
 echo.
 echo 1 - Bistro (interior)
 echo 2 - Bistro (exterior)
 echo 3 - Shader balls
-echo 4 - Zero day
+echo 4 - Kitchen
 :CHOOSE_SCENE
     set /P M=Choose scene [1-4]:
     if %M%==1 (
-        set SCENE=Bistro\BistroInterior.fbx
+        set SCENE=Bistro\BistroInterior.gltf
         goto RUN
     )
     if %M%==2 (
-        set SCENE=Bistro\BistroExterior.fbx
+        set SCENE=Bistro\BistroExterior.gltf
         goto RUN
     )
     if %M%==3 (
-        set SCENE=ShaderBalls\ShaderBalls.obj
+        set SCENE=ShaderBalls\ShaderBalls.gltf
         goto RUN
     )
     if %M%==4 (
-        set SCENE=ZeroDay\MEASURE_SEVEN/MEASURE_SEVEN.fbx
+        set SCENE=Kitchen\Kitchen.gltf
         goto RUN
     )
     goto CHOOSE_SCENE

Shaders.cfg

@@ -1,11 +1,11 @@
 AfterDlss.cs.hlsl -T cs
 Composition.cs.hlsl -T cs
-DirectLighting.cs.hlsl -T cs
+MorphMeshUpdatePrimitives.cs.hlsl -T cs
+MorphMeshUpdateVertices.cs.hlsl -T cs
 PreDlss.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
 UpsampleNis.cs.hlsl -T cs
-AmbientRays.cs.hlsl -T cs
-PrimaryRays.cs.hlsl -T cs
-IndirectRays.cs.hlsl -T cs
-DeltaRays.cs.hlsl -T cs

Shaders/Composition.cs.hlsl

@@ -15,13 +15,15 @@ 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_PsrThroughput, 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_Ambient, t, 7, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_DirectEmission, t, 4, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_PsrThroughput, t, 5, 1 );
+NRI_RESOURCE( Texture2D<float3>, gIn_Ambient, t, 6, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_Shadow, t, 7, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_Diff, t, 8, 1 );
+NRI_RESOURCE( Texture2D<float4>, gIn_Spec, t, 9, 1 );
 #if( NRD_MODE == SH )
-    NRI_RESOURCE( Texture2D<float4>, gIn_DiffSh, t, 8, 1 );
-    NRI_RESOURCE( Texture2D<float4>, gIn_SpecSh, t, 9, 1 );
+    NRI_RESOURCE( Texture2D<float4>, gIn_DiffSh, t, 10, 1 );
+    NRI_RESOURCE( Texture2D<float4>, gIn_SpecSh, t, 11, 1 );
 #endif
 
 // Outputs
@@ -40,36 +42,44 @@ void main( int2 pixelPos : SV_DispatchThreadId )
 
     // ViewZ
     float viewZ = gIn_ViewZ[ pixelPos ];
+    float3 Lemi = gIn_DirectEmission[ pixelPos ];
 
-    // Direct lighting with emission
-    float3 Ldirect = gIn_DirectLighting[ pixelPos ];
-
-    // Normal and roughness
-    float4 normalAndRoughness = NRD_FrontEnd_UnpackNormalAndRoughness( gIn_Normal_Roughness[ pixelPos ] );
+    // Normal, roughness and material ID
+    float normMaterialID;
+    float4 normalAndRoughness = NRD_FrontEnd_UnpackNormalAndRoughness( gIn_Normal_Roughness[ pixelPos ], normMaterialID );
     float3 N = normalAndRoughness.xyz;
     float roughness = normalAndRoughness.w;
 
-    // ( Trick ) Needed only to avoid back facing in "ReprojectRadiance"
+    // ( Trick ) Needed only to avoid back facing in "ReprojectIrradiance"
     float z = abs( viewZ ) * NRD_FP16_VIEWZ_SCALE;
-    z *= STL::Math::Sign( dot( N, gSunDirection ) );
+    z *= STL::Math::Sign( dot( N, gSunDirection_gExposure.xyz ) );
 
     // Early out - sky
     if( abs( viewZ ) == INF )
     {
-        gOut_ComposedDiff[ pixelPos ] = Ldirect * float( gOnScreen == SHOW_FINAL );
+        gOut_ComposedDiff[ pixelPos ] = Lemi * float( gOnScreen == SHOW_FINAL );
         gOut_ComposedSpec_ViewZ[ pixelPos ] = float4( 0, 0, 0, z );
 
         return;
     }
 
+    // Direct sun lighting * shadow + emission
+    float4 shadowData = gIn_Shadow[ pixelPos ];
+    shadowData = SIGMA_BackEnd_UnpackShadow( shadowData );
+    float3 shadow = lerp( shadowData.yzw, 1.0, shadowData.x );
+
+    float3 Ldirect = gIn_DirectLighting[ pixelPos ];
+    if( gOnScreen < SHOW_INSTANCE_INDEX )
+        Ldirect = Ldirect * shadow + Lemi;
+
     // G-buffer
     float3 albedo, Rf0;
     float4 baseColorMetalness = gIn_BaseColor_Metalness[ pixelPos ];
     STL::BRDF::ConvertBaseColorMetalnessToAlbedoRf0( baseColorMetalness.xyz, baseColorMetalness.w, albedo, Rf0 );
 
-    float3 Xv = STL::Geometry::ReconstructViewPosition( sampleUv, gCameraFrustum, viewZ, gOrthoMode );
+    float3 Xv = STL::Geometry::ReconstructViewPosition( sampleUv, gCameraFrustum, viewZ, gViewDirection_gOrthoMode.w );
     float3 X = STL::Geometry::AffineTransform( gViewToWorld, Xv );
-    float3 V = gOrthoMode == 0 ? normalize( gCameraOrigin - X ) : gViewDirection;
+    float3 V = gViewDirection_gOrthoMode.w == 0 ? normalize( gCameraOrigin_gMipBias.xyz - X ) : gViewDirection_gOrthoMode.xyz;
 
     // Sample NRD outputs
     float4 diff = gIn_Diff[ pixelPos ];
@@ -85,7 +95,7 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         NRD_SG diffSg = REBLUR_BackEnd_UnpackSh( diff, diff1 );
         NRD_SG specSg = REBLUR_BackEnd_UnpackSh( spec, spec1 );
 
-        if( gDenoiserType == RELAX )
+        if( gDenoiserType == DENOISER_RELAX )
         {
             diffSg = RELAX_BackEnd_UnpackSh( diff, diff1 );
             specSg = RELAX_BackEnd_UnpackSh( spec, spec1 );
@@ -157,7 +167,7 @@ void main( int2 pixelPos : SV_DispatchThreadId )
             diff.w = NRD_SG_ExtractColor( sg ).x;
     // Decode NORMAL mode outputs
     #else
-        if( gDenoiserType == RELAX )
+        if( gDenoiserType == DENOISER_RELAX )
         {
             diff = RELAX_BackEnd_UnpackRadiance( diff );
             spec = RELAX_BackEnd_UnpackRadiance( spec );
@@ -170,7 +180,7 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     #endif
 
     // ( Optional ) RELAX doesn't support AO / SO
-    if( gDenoiserType == RELAX )
+    if( gDenoiserType == DENOISER_RELAX )
     {
         diff.w = 1.0 / STL::Math::Pi( 1.0 );
         spec.w = 1.0 / STL::Math::Pi( 1.0 );
@@ -195,7 +205,7 @@ void main( int2 pixelPos : SV_DispatchThreadId )
     ambient *= exp2( AMBIENT_FADE * STL::Math::LengthSquared( Xv ) );
     ambient *= gAmbient;
 
-    float specAmbientAmount = gDenoiserType == RELAX ? roughness : GetSpecMagicCurve( roughness );
+    float specAmbientAmount = gDenoiserType == DENOISER_RELAX ? roughness : GetSpecMagicCurve( roughness );
 
     Ldiff += ambient * diff.w * ( 1.0 - Fenv ) * albedo;
     Lspec += ambient * spec.w * Fenv * specAmbientAmount;
@@ -222,6 +232,8 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         Ldiff = diff.w;
     else if( gOnScreen == SHOW_SPECULAR_OCCLUSION )
         Ldiff = spec.w;
+    else if( gOnScreen == SHOW_SHADOW )
+        Ldiff = shadow;
     else if( gOnScreen == SHOW_BASE_COLOR )
         Ldiff = baseColorMetalness.xyz;
     else if( gOnScreen == SHOW_NORMAL )
@@ -230,10 +242,12 @@ void main( int2 pixelPos : SV_DispatchThreadId )
         Ldiff = roughness;
     else if( gOnScreen == SHOW_METALNESS )
         Ldiff = baseColorMetalness.w;
-    else if( gOnScreen == SHOW_WORLD_UNITS )
-        Ldiff = frac( X * gUnitToMetersMultiplier );
+    else if( gOnScreen == SHOW_MATERIAL_ID )
+        Ldiff = normMaterialID;
     else if( gOnScreen == SHOW_PSR_THROUGHPUT )
         Ldiff = psrThroughput;
+    else if( gOnScreen == SHOW_WORLD_UNITS )
+        Ldiff = frac( X * gUnitToMetersMultiplier );
     else if( gOnScreen != SHOW_FINAL )
         Ldiff = gOnScreen == SHOW_MIP_SPECULAR ? spec.xyz : Ldirect.xyz;
 

Shaders/Include/BindingBridge.hlsli

@@ -8,26 +8,25 @@ distribution of this software and related documentation without an express
 license agreement from NVIDIA CORPORATION is strictly prohibited.
 */
 
-#if( defined( COMPILER_DXC ) )
-    #if( defined( VULKAN ) )
 
+#if( defined( __cplusplus ) )
+    #define NRI_RESOURCE( resourceType, resourceName, regName, bindingIndex, setIndex ) \
+        struct resourceName
+#elif( defined( COMPILER_DXC ) )
+    #if( defined( VULKAN ) )
         #define NRI_RESOURCE( resourceType, resourceName, regName, bindingIndex, setIndex ) \
             resourceType resourceName : register( regName ## bindingIndex, space ## setIndex )
 
         #define NRI_PUSH_CONSTANTS( structName, constantBufferName, bindingIndex ) \
             [[vk::push_constant]] structName constantBufferName
-
     #else
-
         #define NRI_RESOURCE( resourceType, resourceName, regName, bindingIndex, setIndex ) \
             resourceType resourceName : register( regName ## bindingIndex, space ## setIndex )
 
         #define NRI_PUSH_CONSTANTS( structName, constantBufferName, bindingIndex ) \
             ConstantBuffer<structName> constantBufferName : register( b ## bindingIndex, space0 )
-
     #endif
 #else
-
     #define NRI_RESOURCE( resourceType, resourceName, regName, bindingIndex, setIndex ) \
         resourceType resourceName : register( regName ## bindingIndex )
 
@@ -36,5 +35,4 @@ license agreement from NVIDIA CORPORATION is strictly prohibited.
         { \
             structName constantBufferName; \
         }
-
 #endif