Merge branch 'sultimt/fix-highlight' into 'main'

Ignore invalid values on highlight See merge request lightspeedrtx/dxvk-remix-nv!898
NVIDIAGameWorks · Jul 15, 2024 · addff26 · addff26
2 parents 0b3584c + 10822bc
commit addff26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/dxvk/rtx_render/rtx_postFx.cpp b/src/dxvk/rtx_render/rtx_postFx.cpp
@@ -399,12 +399,12 @@ namespace dxvk {
 
       valuesToHighlightCountPow = bitCeilPow2(static_cast<uint32_t>(sorted.size()));
 
-      // fill invalid values as UINT32_MAX
+      // fill invalid values as POST_FX_HIGHLIGHTING_INVALID_VALUE
       {
         const size_t validCount = sorted.size();
         sorted.resize(1 << valuesToHighlightCountPow);
         for (size_t i = validCount; i < sorted.size(); i++) {
-          sorted[i] = UINT32_MAX;
+          sorted[i] = POST_FX_HIGHLIGHTING_INVALID_VALUE;
         }
       }
 

diff --git a/src/dxvk/shaders/rtx/pass/post_fx/post_fx.h b/src/dxvk/shaders/rtx/pass/post_fx/post_fx.h
@@ -84,6 +84,7 @@ struct PostFxMotionBlurPrefilterArgs {
 
 #define POST_FX_HIGHLIGHTING_MAX_VALUES_POW 14
 #define POST_FX_HIGHLIGHTING_MAX_VALUES     (1 << POST_FX_HIGHLIGHTING_MAX_VALUES_POW)
+#define POST_FX_HIGHLIGHTING_INVALID_VALUE  0xFFFFFFFF
 
 struct PostFxHighlightingArgs
 {

diff --git a/src/dxvk/shaders/rtx/pass/post_fx/post_fx_highlight.comp.slang b/src/dxvk/shaders/rtx/pass/post_fx/post_fx_highlight.comp.slang
@@ -134,6 +134,11 @@ bool isGBufferMiss(const uint2 position, Texture2D<float> coneRadiusTexture)
 
 bool findValueInArray(uint target)
 {
+  if (target == POST_FX_HIGHLIGHTING_INVALID_VALUE)
+  {
+    return false;
+  }
+
   // binary search with a uniform memory access pattern
   uint foundIndex = 0;