NRD updated to v3.6.0:

- introduced test importance colorization
- improved NRD SDK generation script
- added clearing of sky pixels
- user experience improvements

Author: dzhdanNV

4-Prepare NRD SDK.bat

@@ -12,16 +12,16 @@ set "no_copy_integration="
 :PARSE
 if "%~1"=="" goto :MAIN
 
-if /i "%~1"=="-h"                 goto :HELP
-if /i "%~1"=="--help"             goto :HELP
-  
-if /i "%~1"=="--no-pause"         set "use_pause="
+if /i "%~1"=="-h" goto :HELP
+if /i "%~1"=="--help" goto :HELP
 
-if /i "%~1"=="--copy-shaders"     set "copy_shaders=y"
-if /i "%~1"=="--no-copy-shaders"  set "no_copy_shaders=y"
+if /i "%~1"=="--no-pause" set "use_pause="
 
-if /i "%~1"=="--integration"      set "copy_integration=y"
-if /i "%~1"=="--no-integration"   set "no_copy_integration=y"
+if /i "%~1"=="--shaders" set "copy_shaders=y"
+if /i "%~1"=="--no-shaders" set "no_copy_shaders=y"
+
+if /i "%~1"=="--integration" set "copy_integration=y"
+if /i "%~1"=="--no-integration" set "no_copy_integration=y"
 
 shift
 goto :PARSE
@@ -31,42 +31,49 @@ goto :PARSE
 rd /q /s "_NRD_SDK"
 
 mkdir "_NRD_SDK\Include"
-mkdir "_NRD_SDK\Integration"
 mkdir "_NRD_SDK\Lib\Debug"
 mkdir "_NRD_SDK\Lib\Release"
+mkdir "_NRD_SDK\Shaders"
+mkdir "_NRD_SDK\Shaders\Include"
 
 cd "_NRD_SDK"
 
-copy "..\%NRD_DIR%\Integration\*" "Integration"
 copy "..\%NRD_DIR%\Include\*" "Include"
 copy "..\_Build\Debug\NRD.dll" "Lib\Debug"
 copy "..\_Build\Debug\NRD.lib" "Lib\Debug"
 copy "..\_Build\Debug\NRD.pdb" "Lib\Debug"
 copy "..\_Build\Release\NRD.dll" "Lib\Release"
 copy "..\_Build\Release\NRD.lib" "Lib\Release"
+copy "..\%NRD_DIR%\Shaders\Include\NRD.hlsli" "Shaders\Include"
 copy "..\%NRD_DIR%\LICENSE.txt" "."
 copy "..\%NRD_DIR%\README.md" "."
 
 echo.
 if defined copy_shaders goto :SHADERS
-if defined no_copy_shaders goto :NRI
+if defined no_copy_shaders goto :PRE_INTEGRATION
 set /P M=Do you need the shader source code for a white-box integration? [y/n]
-if /I "%M%" neq "y" goto :NRI
+if /I "%M%" neq "y" goto :PRE_INTEGRATION
 
 :SHADERS
+
 mkdir "Shaders"
 
-xcopy "..\%NRD_DIR%\Shaders\" "Shaders" /s
+xcopy "..\%NRD_DIR%\Shaders\" "Shaders" /s /y
 copy "..\%NRD_DIR%\External\MathLib\*.hlsli" "Shaders\Source"
 
+:PRE_INTEGRATION
 
 echo.
-if defined copy_integration goto :NRI
+if defined copy_integration goto :INTEGRATION
 if defined no_copy_integration goto :END
-set /P M=Do you need NRI required for NRDIntegration? [y/n]
+set /P M=Do you need NRD integration layer? [y/n]
 if /I "%M%" neq "y" goto :END
 
-:NRI
+:INTEGRATION
+
+mkdir "Integration"
+copy "..\%NRD_DIR%\Integration\*" "Integration"
+
 cd ..
 
 rd /q /s "_NRI_SDK"
@@ -95,9 +102,12 @@ if defined use_pause pause
 exit /b %errorlevel%
 
 :HELP
+
 echo. -h, --help          show help message
-echo. --no-pause          skip pause in the end of script
-echo. -s, --copy-shaders  copy shadres for a white-box integration
-echo. -i, --integration   copy NRDIntegration
-exit
+echo. --no-pause          skip pause at the end of the script
+echo. --shaders           copy shaders for a white-box integration
+echo. --no-shaders        do not copy shaders for a white-box integration
+echo. --integration       copy NRD integration layer
+echo. --no-integration    do not copy NRD integration layer
 
+exit

4-Prepare NRD SDK.sh

@@ -6,16 +6,17 @@ NRI_DIR=External/NRIFramework/External/NRI
 rm -rf "_NRD_SDK"
 
 mkdir -p "_NRD_SDK/Include"
-mkdir -p "_NRD_SDK/Integration"
 mkdir -p "_NRD_SDK/Lib/Debug"
 mkdir -p "_NRD_SDK/Lib/Release"
+mkdir -p "_NRD_SDK/Shaders"
+mkdir -p "_NRD_SDK/Shaders/Include"
 
 cd "_NRD_SDK"
 
-cp -r ../$NRD_DIR/Integration/ "Integration"
 cp -r ../$NRD_DIR/Include/ "Include"
 cp -H ../_Build/Debug/libNRD.so "Lib/Debug"
 cp -H ../_Build/Release/libNRD.so "Lib/Release"
+cp ../$NRD_DIR/Shaders/Include/NRD.hlsli "Shaders/Include"
 cp ../$NRD_DIR/LICENSE.txt "."
 cp ../$NRD_DIR/README.md "."
 
@@ -31,19 +32,23 @@ fi
 
 cd ..
 
-read -p "Do you need NRI required for NRDIntegration? [y/n]" -n 1 -r
+read -p "Do you need NRD integration layer? [y/n]" -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
+    mkdir -p "_NRD_SDK/Integration"
+    cp -r $NRD_DIR/Integration/ "_NRD_SDK/Integration"
+
     rm -rf "_NRI_SDK"
 
-    mkdir -p "_NRI_SDK/Include"
+    mkdir -p "_NRI_SDK/Include/Extensions"
     mkdir -p "_NRI_SDK/Lib/Debug"
     mkdir -p "_NRI_SDK/Lib/Release"
 
     cd "_NRI_SDK"
 
     cp -r ../$NRI_DIR/Include/ "Include"
+    cp -r ../$NRI_DIR/Include/Extensions/ "Include/Extensions"
     cp -H ../_Build/Debug/libNRI.so "Lib/Debug"
     cp -H ../_Build/Release/libNRI.so "Lib/Release"
     cp ../$NRI_DIR/LICENSE.txt "."

External/NRD

@@ -270,7 +270,7 @@ TraceOpaqueResult TraceOpaque( TraceOpaqueDesc desc )
                 else
                 {
                     // Generate a ray
-                    float trimmingFactor = NRD_GetTrimmingFactor( materialProps.roughness, gTrimmingParams );
+                    float trimmingFactor = gTrimmingParams.x * STL::Math::SmoothStep( gTrimmingParams.y, gTrimmingParams.z, materialProps.roughness );
                     float3 Vlocal = STL::Geometry::RotateVector( mLocalBasis, -geometryProps.rayDirection );
 
                     float3 Hlocal = STL::ImportanceSampling::VNDF::GetRay( rnd, materialProps.roughness, Vlocal, trimmingFactor );
@@ -487,6 +487,9 @@ void main( uint2 pixelPos : SV_DispatchThreadId )
         gOut_Diff[ outPixelPos ] = 0;
         gOut_Spec[ outPixelPos ] = 0;
 
+        gOut_DiffDirectionPdf[ outPixelPos ] = 0;
+        gOut_SpecDirectionPdf[ outPixelPos ] = 0;
+
         return;
     }
 

External/NRIFramework

@@ -51,6 +51,22 @@ constexpr float NEAR_Z                      = 0.001f; // m
 constexpr bool CAMERA_RELATIVE              = true;
 constexpr bool CAMERA_LEFT_HANDED           = true;
 
+// Important tests, sensitive to regressions or just testing base functionality
+std::vector<uint32_t> checkMeTests =
+{{
+        1, 6, 8, 9, 10, 12, 13, 14, 23, 27, 28,
+        29, 31, 32, 35, 43, 44, 47, 53, 59, 60,
+        62, 67, 75, 79, 95, 109, 110, 114, 120,
+        124, 126, 127, 139, 140, 145, 148, 155,
+        156, 157, 160, 161, 162,
+}};
+
+// Tests, where IQ improvement would be "nice to have"
+std::vector<uint32_t> improveMeTests =
+{{
+        3, 76, 96, 134, 150, 153, 158,
+}};
+
 //=================================================================================
 
 constexpr uint32_t TEXTURES_PER_MATERIAL = 4;
@@ -602,7 +618,6 @@ class Sample : public SampleBase
 
     inline float3 GetSpecularLobeTrimming() const
     {
-        // See NRDSettings.h - it's a good start
         return m_Settings.specularLobeTrimming ? float3(0.95f, 0.04f, 0.11f) : float3(1.0f, 0.0f, 0.0001f);
     }
 
@@ -1772,11 +1787,19 @@ void Sample::PrepareFrame(uint32_t frameIndex)
                             if (i % 14 != 0)
                                 ImGui::SameLine();
 
-                            bool cmp = i == m_LastSelectedTest;
-                            if (cmp)
-                                ImGui::PushStyleColor(ImGuiCol_Text, UI_GREEN);
+                            bool isColorChanged = false;
+                            if(std::find(improveMeTests.begin(), improveMeTests.end(), i + 1) != improveMeTests.end())
+                            {
+                                ImGui::PushStyleColor(ImGuiCol_Text, UI_RED);
+                                isColorChanged = true;
+                            }
+                            else if(std::find(checkMeTests.begin(), checkMeTests.end(), i + 1) != checkMeTests.end())
+                            {
+                                ImGui::PushStyleColor(ImGuiCol_Text, UI_YELLOW);
+                                isColorChanged = true;
+                            }
 
-                            if (ImGui::Button(s, ImVec2(25.0f, 0.0f)) || isTestChanged)
+                            if (ImGui::Button(i == m_LastSelectedTest ? "*" : s, ImVec2(25.0f, 0.0f)) || isTestChanged)
                             {
                                 uint32_t test = isTestChanged ? m_LastSelectedTest : i;
                                 FILE* fp = fopen(path.c_str(), "rb");
@@ -1809,7 +1832,7 @@ void Sample::PrepareFrame(uint32_t frameIndex)
                                 isTestChanged = false;
                             }
 
-                            if (cmp)
+                            if (isColorChanged)
                                 ImGui::PopStyleColor();
                         }
 
@@ -3717,7 +3740,7 @@ void Sample::RenderFrame(uint32_t frameIndex)
         bool isFastHistoryEnabled = m_Settings.maxAccumulatedFrameNum > m_Settings.maxFastAccumulatedFrameNum;
 
         float fps = 1000.0f / m_Timer.GetSmoothedElapsedTime();
-        float maxAccumulatedFrameNum = Clamp(ACCUMULATION_TIME * fps, 1.0f, float(MAX_HISTORY_FRAME_NUM));
+        float maxAccumulatedFrameNum = Clamp(ACCUMULATION_TIME * fps, 5.0f, float(MAX_HISTORY_FRAME_NUM));
         float maxFastAccumulatedFrameNum = isFastHistoryEnabled ? (maxAccumulatedFrameNum / 5.0f) : float(MAX_HISTORY_FRAME_NUM);
 
         m_Settings.maxAccumulatedFrameNum = int32_t(maxAccumulatedFrameNum + 0.5f);
@@ -3978,9 +4001,6 @@ void Sample::RenderFrame(uint32_t frameIndex)
 
             if (m_Settings.denoiser == REBLUR || m_Settings.denoiser == REFERENCE)
             {
-                const float3 trimmingParams = GetSpecularLobeTrimming();
-                m_ReblurSettings.specularLobeTrimmingParameters = {trimmingParams.x, trimmingParams.y, trimmingParams.z};
-
                 nrd::HitDistanceParameters hitDistanceParameters = {};
                 hitDistanceParameters.A = m_Settings.hitDistScale * m_Settings.meterToUnitsMultiplier;
                 m_ReblurSettings.hitDistanceParameters = hitDistanceParameters;