Merge branch 'pkristof/aliasHazardFix' into 'main'

Fixed aliasing hazard for primary virtual motion vector resource by moving a read from debug view to where it's written in gbuffer pass for debug view purposes.

See merge request lightspeedrtx/dxvk-remix-nv!1595

Author: pkristof

src/dxvk/rtx_render/rtx_debug_view.cpp

@@ -527,7 +527,6 @@ namespace dxvk {
         TEXTURE2D(DEBUG_VIEW_BINDING_SHARED_FLAGS_INPUT)
         TEXTURE2D(DEBUG_VIEW_BINDING_PRIMARY_LINEAR_VIEW_Z_INPUT)
         TEXTURE2D(DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_WORLD_SHADING_NORMAL_PERCEPTUAL_ROUGHNESS_INPUT)
-        TEXTURE2D(DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_MOTION_VECTOR_INPUT)
         TEXTURE2D(DEBUG_VIEW_BINDING_PRIMARY_SCREEN_SPACE_MOTION_VECTOR_INPUT)
         TEXTURE2D(DEBUG_VIEW_BINDING_RTXDI_CONFIDENCE_INPUT)
         TEXTURE2D(DEBUG_VIEW_BINDING_RENDER_OUTPUT_INPUT)
@@ -1252,7 +1251,6 @@ namespace dxvk {
     ctx->bindResourceView(DEBUG_VIEW_BINDING_SHARED_FLAGS_INPUT, rtOutput.m_sharedFlags.view, nullptr);
     ctx->bindResourceView(DEBUG_VIEW_BINDING_PRIMARY_LINEAR_VIEW_Z_INPUT, rtOutput.m_primaryLinearViewZ.view, nullptr);
     ctx->bindResourceView(DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_WORLD_SHADING_NORMAL_PERCEPTUAL_ROUGHNESS_INPUT, rtOutput.m_primaryVirtualWorldShadingNormalPerceptualRoughness.view, nullptr);
-    ctx->bindResourceView(DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_MOTION_VECTOR_INPUT, rtOutput.m_primaryVirtualMotionVector.view(Resources::AccessType::Read), nullptr);
     ctx->bindResourceView(DEBUG_VIEW_BINDING_PRIMARY_SCREEN_SPACE_MOTION_VECTOR_INPUT, rtOutput.m_primaryScreenSpaceMotionVector.view, nullptr);
     ctx->bindResourceView(DEBUG_VIEW_BINDING_RTXDI_CONFIDENCE_INPUT, rtOutput.getCurrentRtxdiConfidence().view(Resources::AccessType::Read, debugViewArgs.isRTXDIConfidenceValid), nullptr);
     Rc<DxvkImageView> renderOutput =

src/dxvk/rtx_render/rtx_resources.cpp

@@ -410,7 +410,7 @@ namespace dxvk {
         m_raytracingOutput.m_primaryRtxdiTemporalPosition = AliasedResource(m_raytracingOutput.m_primaryVirtualWorldShadingNormalPerceptualRoughnessDenoising, ctx, m_downscaledExtent, VK_FORMAT_R32_UINT, "primary rtxdi temporal position", true);
       }
 
-      if (RtxOptions::integrateIndirectMode() == IntegrateIndirectMode::NeuralRadianceCache && DebugView::debugViewIdx() == DEBUG_VIEW_DISABLED && RtxOptions::captureDebugImage() == false) {
+      if (RtxOptions::integrateIndirectMode() == IntegrateIndirectMode::NeuralRadianceCache && RtxOptions::captureDebugImage() == false) {
         m_raytracingOutput.m_indirectRadianceHitDistance = AliasedResource(m_raytracingOutput.m_primaryVirtualMotionVector, ctx, m_downscaledExtent, VK_FORMAT_R16G16B16A16_SFLOAT, "Indirect Radiance Hit Distance", true);
 
         // m_primaryRtxdiTemporalPosition and m_primaryVirtualWorldShadingNormalPerceptualRoughnessDenoising has different format, so they have different image views

src/dxvk/shaders/rtx/algorithm/geometry_resolver.slangh

@@ -332,6 +332,8 @@ void geometryResolverOutputSurface(
     alphaBlendSurface.finalize(surface.hashPacked);
     AlphaBlendGBuffer[pixelCoordinate] = alphaBlendSurface.pack();
   }
+
+  geometryResolverOutputSurfaceDebugView(pixelCoordinate, virtualMotion);
 }
 
 void geometryResolverDLSSRROutputSurface(
@@ -389,6 +391,31 @@ void accumulateParticleBuffer(ivec2 pixelCoordinate, vec3 radiance)
   ParticleBuffer[pixelCoordinate] = prevParticleEmissive;
 }
 
+void geometryResolverOutputSurfaceDebugView(
+  uvec2 pixelCoordinate,
+  vec3 virtualMotion)
+ {
+  switch(cb.debugView)
+  {
+  default:
+  case DEBUG_VIEW_DISABLED:
+    break;
+  case DEBUG_VIEW_VIRTUAL_MOTION_VECTOR:
+    storeInDebugView(pixelCoordinate, virtualMotion);
+    break;
+   case DEBUG_VIEW_NAN:
+   {
+     bool isValid = true;
+      
+     // DEBUG_VIEW_VIRTUAL_MOTION_VECTOR
+     isValid &= isValidValue(virtualMotion);
+
+     accumulateInDebugViewAnd(pixelCoordinate, isValid);
+     break;
+   }
+  }
+}
+
 void geometryResolverVertexOutputDebugView(
   uvec2 pixelCoordinate,
   Ray ray, RayInteraction rayInteraction,

src/dxvk/shaders/rtx/pass/debug_view/debug_view.comp.slang

@@ -72,8 +72,6 @@ layout(r32f, binding = DEBUG_VIEW_BINDING_PRIMARY_LINEAR_VIEW_Z_INPUT)
 Texture2D<float> PrimaryLinearViewZ;
 layout(rgba16, binding = DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_WORLD_SHADING_NORMAL_PERCEPTUAL_ROUGHNESS_INPUT)
 Texture2D<float4> PrimaryVirtualWorldNormalPerceptualRoughness;
-layout(rgba16, binding = DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_MOTION_VECTOR_INPUT)
-Texture2D<float4> PrimaryVirtualMotionVector;
 layout(rg16, binding = DEBUG_VIEW_BINDING_PRIMARY_SCREEN_SPACE_MOTION_VECTOR_INPUT)
 Texture2D<float2> PrimaryScreenSpaceMotionVector;
 layout(rgba16f, binding = DEBUG_VIEW_BINDING_RTXDI_CONFIDENCE_INPUT)
@@ -270,9 +268,6 @@ vec4 loadInput(inout RNG randomState, ivec2 threadId)
   case DEBUG_VIEW_VIRTUAL_SHADING_NORMAL:
     value = unormVectorToColor(PrimaryVirtualWorldNormalPerceptualRoughness[threadId].xyz);
     break;
-  case DEBUG_VIEW_VIRTUAL_MOTION_VECTOR:
-    value = vec4(abs(PrimaryVirtualMotionVector[threadId].xyz), 1);
-    break;
   case DEBUG_VIEW_SCREEN_SPACE_MOTION_VECTOR:
     value = vec4(abs(PrimaryScreenSpaceMotionVector[threadId].xy), 0, 1);
     break;
@@ -488,8 +483,6 @@ vec4 loadInput(inout RNG randomState, ivec2 threadId)
 
     // DEBUG_VIEW_VIRTUAL_SHADING_NORMAL
     isValid &= isValidValue(unormVectorToColor(PrimaryVirtualWorldNormalPerceptualRoughness[threadId].xyz));
-    // DEBUG_VIEW_VIRTUAL_MOTION_VECTOR
-    isValid &= isValidValue(PrimaryVirtualMotionVector[threadId].xy);
     // DEBUG_VIEW_SCREEN_SPACE_MOTION_VECTOR
     isValid &= isValidValue(PrimaryScreenSpaceMotionVector[threadId].xy);
 

src/dxvk/shaders/rtx/pass/debug_view/debug_view_binding_indices.h

@@ -36,7 +36,7 @@
 #define DEBUG_VIEW_BINDING_SHARED_FLAGS_INPUT                                              7
 #define DEBUG_VIEW_BINDING_PRIMARY_LINEAR_VIEW_Z_INPUT                                     8
 #define DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_WORLD_SHADING_NORMAL_PERCEPTUAL_ROUGHNESS_INPUT 9
-#define DEBUG_VIEW_BINDING_PRIMARY_VIRTUAL_MOTION_VECTOR_INPUT                             10
+
 #define DEBUG_VIEW_BINDING_PRIMARY_SCREEN_SPACE_MOTION_VECTOR_INPUT                        11
 #define DEBUG_VIEW_BINDING_RTXDI_CONFIDENCE_INPUT                                          12
 #define DEBUG_VIEW_BINDING_RENDER_OUTPUT_INPUT                                             13