Merge branch 'drawcall2' into 'main'

[REMIX-5428] Implement preserving instances across frames for static draw calls.

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

Author: MarkEHenderson

AGENTS.md

@@ -36,6 +36,7 @@ Full guide: `documentation/CONTRIBUTING-style-guide.md`
   - Member variables: `m_` prefix (e.g. `m_value`)
   - Pointers: `p` prefix (e.g. `pInput`, `m_pPointer`)
   - Variables and functions: `camelCase`
+  - Functions: Prefer short verb + object names aligned with the subsystem; avoid encoding implementation steps in the identifier (see `documentation/CONTRIBUTING-style-guide.md`, Naming Conventions).
   - Constants: `k` prefix and camelCase, i.e. `kConstantName`
   - Macros and defines: `UPPER_CASE`
   - Classes and structs: `PascalCase`

RtxOptions.md

@@ -239,6 +239,7 @@ This file is auto-generated by RTX Remix. To regenerate it, run Remix with `DXVK
 |rtx.enablePSTRSecondaryIncidentSplitApproximation|bool|True|||Enable transmission PSR on secondary incident transmission events such as entering a translucent material on an already\-transmitted path \(rather than respecting no\-split path PSR rule\)\.<br>Typically this results in better looking glass when enabled \(at the cost accuracy due to ignoring reflections off of glass seen through glass for example\)\.|
 |rtx.enablePortalFadeInEffect|bool|False||||
 |rtx.enablePresentThrottle|bool|False|||A flag to enable or disable present throttling, when set to true a sleep for a time specified by the throttle delay will be inserted into the DXVK presentation thread\.<br>Useful to manually reduce the framerate if the application is running too fast or to reduce GPU power usage during development to keep temperatures down\.<br>Should not be enabled in anything other than development situations\.|
+|rtx.enablePreservePath|bool|True|||When true, Remix attempts to identify draw calls whose state has not changed since last frame and re\-use the previous<br>frame's translation, rather than retranslating the draw call into raytrace\-ready scene data\.<br>When false, every submit uses full dynamic geometry and instance processing \(drawReplacements / processDrawCallState\)\.<br>Disable for debugging or compatibility when suspecting preserve\-path regressions\.|
 |rtx.enableProbabilisticUnorderedResolveInIndirectRays|bool|True|||A flag to enable or disable probabilistic unordered resolve approximations in indirect rays\.<br>This flag speeds up the unordered resolve for indirect rays by probabilistically deciding when to perform unordered resolve or not\.  Must have both unordered resolve and unordered resolve in indirect rays enabled for this to take effect\.<br>This option should be enabled by default as it can significantly improve performance on some hardware\.  In rare cases it may come at the cost of some quality for particles and decals in reflections\.<br>Note that even with this option enabled, unordered resolve approximations are only done on the first indirect bounce for the sake of performance overall\.|
 |rtx.enableRayReconstruction|bool|True|||Enables DLSS ray reconstruction, an AI\-based denoiser designed for real time ray tracing\.|
 |rtx.enableRaytracing|bool|True|||Globally enables or disables ray tracing\. When set to false the original game should render mostly as it would in DXVK typically\.<br>Some artifacts may still appear however compared to the original game either due to issues with the underlying DXVK translation or issues in Remix itself\.|
@@ -833,8 +834,6 @@ This file is auto-generated by RTX Remix. To regenerate it, run Remix with `DXVK
 |rtx.useDenoiser|bool|True|||Enables usage of denoiser\(s\) when set to true, otherwise disables denoising when set to false\.<br>Denoising is important for filtering the raw noisy ray traced signal into a smoother and more stable result at the cost of some potential spatial/temporal artifacts \(ghosting, boiling, blurring, etc\)\.<br>Generally should remain enabled except when debugging behavior which requires investigating the output directly, or diagnosing denoising\-related issues\.|
 |rtx.useDenoiserReferenceMode|bool|False|||Enables reference "denoiser" \(~ accumulation mode\) when set to true, otherwise uses a standard denoiser\.<br>The reference denoiser accumulates frames over time to generate a reference multi\-sample per pixel contribution<br>which should converge slowly to the ideal result the renderer is working towards\.<br>It is useful for analyzing quality differences in various denoising methods, post\-processing filters,<br>or for more accurately comparing subtle effects of potentially biased rendering techniques<br>which may be hard to see through noise and filtering\.<br>It is also useful for higher quality artistic renders of a scene beyond what is possible in real\-time\.|
 |rtx.useHighlightLegacyMode|bool|False||||
-|rtx.useHighlightUnsafeAnchorMode|bool|False||||
-|rtx.useHighlightUnsafeReplacementMode|bool|False||||
 |rtx.useIntersectionBillboardsOnPrimaryRays|bool|False||||
 |rtx.useLegacyACES|bool|True|||Use a luminance\-only approximation of ACES that over\-saturates the highlights\. If false, use a refined ACES transform that converts between color spaces with more precision\.|
 |rtx.useNewGuiInputMethod|bool|True|||Disables the previous method for getting mouse/keyboard input and enables a new method which should be more reliable\.  If successful the old method will be deprecated\.  This setting can't be changed at runtime, so it must be set in a \.conf file\.|

documentation/CONTRIBUTING-style-guide.md

@@ -26,6 +26,7 @@ This document outlines our project's C++ code formatting standards, commenting s
 - **Constants**: `k` prefix and camelCase, i.e. `kConstantName`
 -  **Macros and defines**: UPPER_CASE
 - **Class and struct names**: PascalCase
+- **Functions**: Prefer a short **verb + object** name that matches vocabulary in the same subsystem (e.g. `registerCamera`, `mergeInstanceHeuristics`). Do not spell out mechanics (which container, per-frame reset); put that in a comment on the definition or call site.
 
   ```cpp
   class Example {

src/dxvk/dxvk_sampler.h

@@ -3,6 +3,7 @@
 #include "dxvk_resource.h"
 // NV-DXVK start
 #include "../util/xxHash/xxhash.h"
+#include "../util/util_struct_hash.h"
 // NV-DXVK end
 
 namespace dxvk {
@@ -44,9 +45,22 @@ namespace dxvk {
 
     // NV-DXVK start
     XXH64_hash_t calculateHash() const {
-      static_assert(sizeof(DxvkSamplerCreateInfo) == 72 && "DxvkSamplerCreateInfo changed. Double check the struct is still fully padded and initialized. This is needed for used hashing and comparison functions.");
-     
-      return XXH3_64bits(this, sizeof(DxvkSamplerCreateInfo));
+      return hashStructByMemory(*this,
+          &DxvkSamplerCreateInfo::magFilter,
+          &DxvkSamplerCreateInfo::minFilter,
+          &DxvkSamplerCreateInfo::mipmapMode,
+          &DxvkSamplerCreateInfo::mipmapLodBias,
+          &DxvkSamplerCreateInfo::mipmapLodMin,
+          &DxvkSamplerCreateInfo::mipmapLodMax,
+          &DxvkSamplerCreateInfo::useAnisotropy,
+          &DxvkSamplerCreateInfo::maxAnisotropy,
+          &DxvkSamplerCreateInfo::addressModeU,
+          &DxvkSamplerCreateInfo::addressModeV,
+          &DxvkSamplerCreateInfo::addressModeW,
+          &DxvkSamplerCreateInfo::compareToDepth,
+          &DxvkSamplerCreateInfo::compareOp,
+          &DxvkSamplerCreateInfo::borderColor,
+          &DxvkSamplerCreateInfo::usePixelCoord);
     }
 
     bool operator== (const DxvkSamplerCreateInfo& other) const {

src/dxvk/imgui/dxvk_imgui.cpp

@@ -1637,6 +1637,7 @@ namespace dxvk {
 
     if (RemixGui::CollapsingHeader("Developer Options", collapsingHeaderFlags)) {
       ImGui::Indent();
+      RemixGui::Checkbox("Enable Preserve Path", &RtxOptions::enablePreservePathObject());
       RemixGui::Checkbox("Enable Instance Debugging", &RtxOptions::enableInstanceDebuggingToolsObject());
       RemixGui::Checkbox("Disable Draw Calls Post RTX Injection", &RtxOptions::skipDrawCallsPostRTXInjectionObject());
       RemixGui::Checkbox("Break into Debugger On Press of Key 'B'", &RtxOptions::enableBreakIntoDebuggerOnPressingBObject());
@@ -2543,8 +2544,6 @@ namespace dxvk {
     ImGui::EndDisabled();
     RemixGui::Separator();
     RemixGui::Checkbox("Highlight Legacy Materials (flash red)", &RtxOptions::useHighlightLegacyModeObject());
-    RemixGui::Checkbox("Highlight Legacy Meshes with Shared Vertex Buffers (dull purple)", &RtxOptions::useHighlightUnsafeAnchorModeObject());
-    RemixGui::Checkbox("Highlight Replacements with Unstable Anchors (flash red)", &RtxOptions::useHighlightUnsafeReplacementModeObject());
 
   }
 

src/dxvk/rtx_render/rtx_accel_manager.cpp

@@ -1172,7 +1172,6 @@ namespace dxvk {
       uint32_t primitiveCount;
       uint32_t pad;
     };
-    static_assert(sizeof(BucketGeometryContentHashData) == 80, "BucketGeometryContentHashData must remain fully padded for stable hashing.");
     std::vector<BucketGeometryContentHashData> contentHashData;
 
     // Create or find a matching BLAS for each bucket, then build it
@@ -1252,7 +1251,13 @@ namespace dxvk {
         // Geometry order is part of the merged BLAS layout and affects primitive
         // to surface mapping, so include the bucket order in the content hash.
         if (!contentHashData.empty()) {
-          newContentHash = XXH3_64bits(contentHashData.data(), contentHashData.size() * sizeof(contentHashData[0]));
+          newContentHash = hashStructArrayByMemory(contentHashData.data(), contentHashData.size(),
+              &BucketGeometryContentHashData::vertexHash,
+              &BucketGeometryContentHashData::indexHash,
+              &BucketGeometryContentHashData::boneHash,
+              &BucketGeometryContentHashData::transform,
+              &BucketGeometryContentHashData::primitiveCount,
+              &BucketGeometryContentHashData::pad);
         }
       }
 

src/dxvk/rtx_render/rtx_accel_manager.h

@@ -32,6 +32,7 @@
 #include "rtx_point_instancer_system.h"
 #include "../util/util_vector.h"
 #include "../util/util_matrix.h"
+#include "../util/util_struct_hash.h"
 
 namespace dxvk 
 {
@@ -90,11 +91,17 @@ class AccelManager : public CommonDeviceObject {
              isSubsurface == other.isSubsurface;
     }
   };
-  static_assert(sizeof(BlasBucketKey) == 16, "BlasBucketKey must remain fully padded for stable hashing.");
 
   struct BlasBucketKeyHash {
     size_t operator()(const BlasBucketKey& k) const {
-      return static_cast<size_t>(XXH3_64bits(&k, sizeof(k)));
+      return static_cast<size_t>(hashStructByMemory(k,
+          &BlasBucketKey::instanceShaderBindingTableRecordOffset,
+          &BlasBucketKey::customIndexFlags,
+          &BlasBucketKey::instanceFlags,
+          &BlasBucketKey::instanceMask,
+          &BlasBucketKey::usesUnorderedApproximations,
+          &BlasBucketKey::isSubsurface,
+          &BlasBucketKey::pad));
     }
   };
 

src/dxvk/rtx_render/rtx_debug_view.cpp

@@ -70,6 +70,7 @@ namespace dxvk {
         {DEBUG_VIEW_BARYCENTRICS, "Barycentric Coordinates"},
         {DEBUG_VIEW_IS_FRONT_HIT, "Is Front Hit"},
         {DEBUG_VIEW_IS_STATIC, "Is Static"},
+        {DEBUG_VIEW_PRESERVE_PATH, "Preserve path (preserved instances)"},
         {DEBUG_VIEW_IS_OPAQUE, "Is Opaque"},
         {DEBUG_VIEW_IS_THIN_OPAQUE, "Is Thin Opaque"},
         {DEBUG_VIEW_IS_SUBSURFACE_SCATTERING, "Is Subsurface Scattering (SSS)"},