HnPostProcessTask: disabled depth rescaling shader logic if scene depth mode is not enabled

Author: TheMostDiligent

Hydrogent/interface/Tasks/HnPostProcessTask.hpp

@@ -294,12 +294,13 @@ class HnPostProcessTask final : public HnTask
             PPTask{_PPTask}
         {}
         void PreparePRS();
-        void PreparePSO(TEXTURE_FORMAT RTVFormat);
+        void PreparePSO(TEXTURE_FORMAT RTVFormat, HN_VIEW_MODE _ViewMode);
         void PrepareSRB(ITextureView* pClosestSelectedLocationSRV, Uint32 FrameIdx);
 
     private:
-        bool ConvertOutputToSRGB = false;
-        int  ToneMappingMode     = 0;
+        HN_VIEW_MODE ViewMode            = HN_VIEW_MODE_SHADED;
+        bool         ConvertOutputToSRGB = false;
+        int          ToneMappingMode     = 0;
 
         CoordinateGridRenderer::FEATURE_FLAGS GridFeatureFlags = CoordinateGridRenderer::FEATURE_FLAG_NONE;
     } m_PostProcessTech;

Hydrogent/shaders/HnPostProcess.psh

@@ -43,7 +43,8 @@ void main(in  FullScreenTriangleVSOutput VSOut,
     float4 Pos = VSOut.f4PixelPos;
 
     Color = g_ColorBuffer.Load(int3(Pos.xy, 0));
-    if (g_Frame.Renderer.DebugView == DEBUG_VIEW_SCENE_DEPTH && g_Frame.Renderer.LoadingAnimation.Factor == 0.0)
+#if VIEW_MODE == VIEW_MODE_SCENE_DEPTH
+    if (g_Frame.Renderer.LoadingAnimation.Factor == 0.0)
     {
         // The overlay was rendered with Scene Range == Camera Range. 
         // At the end of the frame, we computed the accurate scene depth range in HnComputeDepthBoundsTask,
@@ -55,9 +56,10 @@ void main(in  FullScreenTriangleVSOutput VSOut,
         RelZ = saturate(RelZ);
         Color.rgb = float3(RelZ, RelZ, RelZ);
     }
-    
+#endif
+
     float Opacity = 1.0 - Color.a;
-    
+
     float SSRScale = g_Attribs.SSRScale * Opacity;
     if (SSRScale > 0.0)
     {
@@ -66,7 +68,7 @@ void main(in  FullScreenTriangleVSOutput VSOut,
         float3 Normal      = g_Normal.Load(int3(VSOut.f4PixelPos.xy, 0)).xyz;
         float4 BaseColor   = g_BaseColor.Load(int3(Pos.xy, 0));
         float4 Material    = g_MaterialData.Load(int3(Pos.xy, 0));
-    
+
         float Roughness = saturate(Material.x);
         float Metallic  = saturate(Material.y);
         SurfaceReflectanceInfo SrfInfo = GetSurfaceReflectanceMR(BaseColor.rgb, Metallic, Roughness);
@@ -79,9 +81,9 @@ void main(in  FullScreenTriangleVSOutput VSOut,
                                                      g_PreintegratedGGX_sampler,
                                                      Normal,
                                                      ViewDir);
-    
+
         float3 SSR = GetSpecularIBL_GGX(SrfInfo, IBLInfo, SSRRadiance.rgb);
-    
+
         Color.rgb += (SSR.rgb - SpecularIBL.rgb) * SSRRadiance.w * SSRScale;
     }
 
@@ -93,7 +95,7 @@ void main(in  FullScreenTriangleVSOutput VSOut,
         float Occlusion = lerp(1.0, g_SSAO.Load(int3(Pos.xy, 0)).x, SSAOScale);
         Color.rgb *= Occlusion;
     }
-    
+
 #if TONE_MAPPING_MODE > TONE_MAPPING_MODE_NONE
     Color.rgb = ToneMap(Color.rgb, g_Attribs.ToneMapping, g_Attribs.AverageLogLum * exp2(-g_Frame.Camera.fExposure));
 #endif

Hydrogent/src/Tasks/HnPostProcessTask.cpp

@@ -154,7 +154,7 @@ static GraphicsPipelineStateCreateInfoX& CreateShaders(RenderDeviceWithCache_E&
     return PsoCI;
 }
 
-void HnPostProcessTask::PostProcessingTechnique::PreparePSO(TEXTURE_FORMAT RTVFormat)
+void HnPostProcessTask::PostProcessingTechnique::PreparePSO(TEXTURE_FORMAT RTVFormat, HN_VIEW_MODE _ViewMode)
 {
     bool IsDirty = PSO && PSO->GetGraphicsPipelineDesc().RTVFormats[0] != RTVFormat;
 
@@ -185,6 +185,17 @@ void HnPostProcessTask::PostProcessingTechnique::PreparePSO(TEXTURE_FORMAT RTVFo
         }
     }
 
+    {
+        if (_ViewMode != HN_VIEW_MODE_SCENE_DEPTH)
+            _ViewMode = HN_VIEW_MODE_SHADED;
+
+        if (ViewMode != _ViewMode)
+        {
+            ViewMode = _ViewMode;
+            IsDirty  = true;
+        }
+    }
+
     if (IsDirty)
         PSO.Release();
 
@@ -202,7 +213,8 @@ void HnPostProcessTask::PostProcessingTechnique::PreparePSO(TEXTURE_FORMAT RTVFo
         ShaderMacroHelper Macros;
         Macros.Add("CONVERT_OUTPUT_TO_SRGB", ConvertOutputToSRGB);
         Macros.Add("TONE_MAPPING_MODE", ToneMappingMode);
-        Macros.Add("DEBUG_VIEW_SCENE_DEPTH", static_cast<int>(PBR_Renderer::DebugViewType::SceneDepth));
+        Macros.Add("VIEW_MODE_SCENE_DEPTH", static_cast<int>(HN_VIEW_MODE_SCENE_DEPTH));
+        Macros.Add("VIEW_MODE", static_cast<int>(ViewMode));
         if (GridFeatureFlags != CoordinateGridRenderer::FEATURE_FLAG_NONE)
         {
             Macros.Add("ENABLE_GRID", 1);
@@ -632,7 +644,7 @@ void HnPostProcessTask::Prepare(pxr::HdTaskContext* TaskCtx,
     // Initialize post-processing and copy frame techniques first as they
     // don't use async shader compilation.
     m_PostProcessTech.PreparePRS();
-    m_PostProcessTech.PreparePSO((m_UseTAA ? m_FrameTargets->JitteredFinalColorRTV : m_FinalColorRTV)->GetDesc().Format);
+    m_PostProcessTech.PreparePSO((m_UseTAA ? m_FrameTargets->JitteredFinalColorRTV : m_FinalColorRTV)->GetDesc().Format, ViewMode);
 
     m_CopyFrameTech.PreparePRS();
     m_CopyFrameTech.PreparePSO(m_FinalColorRTV->GetDesc().Format);