Sync with "simplex"

Author: dzhdanNV

3-PrepareSDK.bat

@@ -16,8 +16,8 @@ mkdir "Shaders"
 
 copy "%NRD%\Include\*" "Include"
 copy "%NRD%\Integration\*" "Integration"
-copy "%NRD%\Shaders\Include\NRD.hlsli" "Shaders"
-copy "%NRD%\Shaders\Include\NRDConfig.hlsli" "Shaders"
+copy "%NRD%\Shaders\NRD.hlsli" "Shaders"
+copy "%NRD%\Shaders\NRDConfig.hlsli" "Shaders"
 copy "%NRD%\LICENSE.txt" "."
 copy "%NRD%\README.md" "."
 copy "%NRD%\UPDATE.md" "."

3-PrepareSDK.sh

@@ -16,8 +16,8 @@ mkdir -p "Shaders"
 
 cp -r "$(NRD)/Include/" "Include"
 cp -r "$(NRD)/Integration/" "Integration"
-cp -r "$(NRD)/Shaders/Include/NRD.hlsli" "Shaders"
-cp -r "$(NRD)/Shaders/Include/NRDConfig.hlsli" "Shaders"
+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" "."

CMakeLists.txt

@@ -207,7 +207,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
     SHADERMAKE_DXC_VK_PATH=${SHADERMAKE_DXC_VK_PATH}
     ML_SOURCE_DIR=${ML_SOURCE_DIR}
     NRI_SOURCE_DIR=${NRI_SOURCE_DIR}/Include
-    NRD_SOURCE_DIR=${NRD_SOURCE_DIR}/Shaders/Include
+    NRD_SOURCE_DIR=${NRD_SOURCE_DIR}/Shaders
     SHARC_SOURCE_DIR=${sharc_SOURCE_DIR}/include
     RTXCR_SOURCE_DIR=${rtxcr_SOURCE_DIR}/shaders/include/rtxcr
     RTXCR_INTEGRATION=$<BOOL:${RTXCR_INTEGRATION}>
@@ -258,7 +258,7 @@ set(SHADERMAKE_GENERAL_ARGS
     -I "Shaders"
     -I "External"
     -I "${ML_SOURCE_DIR}"
-    -I "${NRD_SOURCE_DIR}/Shaders/Include"
+    -I "${NRD_SOURCE_DIR}/Shaders"
     -I "${NRI_SOURCE_DIR}/Include"
     -I "${sharc_SOURCE_DIR}/include"
     -I "${rtxcr_SOURCE_DIR}/shaders/include/rtxcr"

External/NRD

@@ -94,6 +94,9 @@ void main( uint2 pixelPos : SV_DispatchThreadId )
         gradient = Color::HdrToLinear_Uncharted( gradient * gExposure ).x; // or normalize to the blurred final image or SHARC cache
         gradient *= 1.0 - ( Sequence::Bayer4x4( pixelPos, gFrameIndex ) - 0.5 ) * 1.0; // optional dithering
         gradient = 1.0 - Color::ToSrgb( saturate( gradient ) ).x;
+
+        if( gDenoiserType == DENOISER_RELAX )
+            gradient *= gradient; // TODO: RELAX uses "history confidence" differently...
     }
 
     gOut_Gradient[ pixelPos ] = float4( gradient, data0.yzw );

External/NRIFramework

@@ -1543,13 +1543,9 @@ void Sample::PrepareFrame(uint32_t frameIndex) {
                                 if (hasSpatial) {
                                     m_ReblurSettings.minBlurRadius = 0.0f;
                                     m_ReblurSettings.maxBlurRadius = 0.0f;
-                                    m_ReblurSettings.diffusePrepassBlurRadius = 0.0f;
-                                    m_ReblurSettings.specularPrepassBlurRadius = 0.0f;
                                 } else {
                                     m_ReblurSettings.minBlurRadius = defaults.minBlurRadius;
                                     m_ReblurSettings.maxBlurRadius = defaults.maxBlurRadius;
-                                    m_ReblurSettings.diffusePrepassBlurRadius = defaults.diffusePrepassBlurRadius;
-                                    m_ReblurSettings.specularPrepassBlurRadius = defaults.specularPrepassBlurRadius;
                                 }
                             }
 
@@ -1593,11 +1589,7 @@ void Sample::PrepareFrame(uint32_t frameIndex) {
                                 ImGui::PopStyleColor();
 #endif
 
-                            ImGui::PushStyleColor(ImGuiCol_Text, m_ReblurSettings.minBlurRadius < 0.5f ? UI_RED : UI_DEFAULT);
-                            ImGui::SliderFloat("Min blur radius (px)", &m_ReblurSettings.minBlurRadius, 0.0f, 10.0f, "%.1f");
-                            ImGui::PopStyleColor();
-
-                            ImGui::SliderFloat("Max blur radius (px)", &m_ReblurSettings.maxBlurRadius, 0.0f, 60.0f, "%.1f");
+                            ImGui::SliderFloat2("Blur radius (px)", &m_ReblurSettings.minBlurRadius, 0.0f, 60.0f, "%.1f", ImGuiSliderFlags_Logarithmic);
                             ImGui::SliderFloat("Lobe fraction", &m_ReblurSettings.lobeAngleFraction, 0.0f, 1.0f, "%.2f");
                             ImGui::SliderFloat("Roughness fraction", &m_ReblurSettings.roughnessFraction, 0.0f, 1.0f, "%.2f");
                             ImGui::SliderFloat("Min hitT weight", &m_ReblurSettings.minHitDistanceWeight, 0.01f, 0.2f, "%.2f");
@@ -1626,14 +1618,10 @@ void Sample::PrepareFrame(uint32_t frameIndex) {
                                 if (hasSpatial) {
                                     m_RelaxSettings.diffusePhiLuminance = 0.0f;
                                     m_RelaxSettings.specularPhiLuminance = 0.0f;
-                                    m_RelaxSettings.diffusePrepassBlurRadius = 0.0f;
-                                    m_RelaxSettings.specularPrepassBlurRadius = 0.0f;
                                     m_RelaxSettings.spatialVarianceEstimationHistoryThreshold = 0;
                                 } else {
                                     m_RelaxSettings.diffusePhiLuminance = defaults.diffusePhiLuminance;
                                     m_RelaxSettings.specularPhiLuminance = defaults.specularPhiLuminance;
-                                    m_RelaxSettings.diffusePrepassBlurRadius = defaults.diffusePrepassBlurRadius;
-                                    m_RelaxSettings.specularPrepassBlurRadius = defaults.specularPrepassBlurRadius;
                                     m_RelaxSettings.spatialVarianceEstimationHistoryThreshold = defaults.spatialVarianceEstimationHistoryThreshold;
                                 }
                             }