Merge branch 'xbei/option_layers_fix' into 'main'

Fix virtual key binding issue and optimize option queue

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

Author: xbei-nv

RtxOptions.md

@@ -894,7 +894,7 @@ Tables below enumerate all the options and their defaults set by RTX Remix. Note
 |rtx.baseGameModRegex|string||||Regex used to determine if the base game is running a mod, like a sourcemod\.|
 |rtx.beamTextures|hash set||||Textures on draw calls that are already particles or emissively blended and have beam\-like geometry\.<br>Typically objects marked as particles or objects using emissive blending will be rendered with a special method which allows re\-orientation of the billboard geometry assumed to make up the draw call in indirect rays \(reflections for example\)\.<br>This method works fine for typical particles, but some \(e\.g\. a laser beam\) may not be well\-represented with the typical billboard assumption of simply needing to rotate around its centroid to face the view direction\.<br>To handle such cases a different beam mode is used to treat objects as more of a cylindrical beam and re\-orient around its main spanning axis, allowing for better rendering of these beam\-like effect objects\.|
 |rtx.cameraSequence.filePath|string||||File path\.|
-|rtx.captureHotKey|virtual keys|CTRL + SHFT + Q|||Hotkey to trigger a capture without bringing up the menu\.<br>example override: 'rtx\.captureHotKey = CTRL, SHIFT, P'\.<br>Full list of key names available in \`src/util/util\_keybind\.h\`\.|
+|rtx.captureHotKey|virtual keys|CTRL,SHFT,Q|||Hotkey to trigger a capture without bringing up the menu\.<br>example override: 'rtx\.captureHotKey = CTRL, SHIFT, P'\.<br>Full list of key names available in \`src/util/util\_keybind\.h\`\.|
 |rtx.captureInstanceStageName|string|capture_{timestamp}.usd|||Name of the 'instance' stage \(see: 'rtx\.captureInstances'\)\.|
 |rtx.captureTimestampReplacement|string|{timestamp}|||String that can be used for auto\-replacing current time stamp in instance stage name\.<br>Note: Changing this value does not change the default value for rtx\.captureInstanceStageName\.|
 |rtx.decalTextures|hash set||||Textures on draw calls used for static geometric decals or decals with complex topology\.<br>These materials will be blended over the materials underneath them when decal material blending is enabled\.<br>A small configurable offset is applied to each flat/co\-planar part of these decals to prevent coplanar geometric cases \(which poses problems for ray tracing\)\.|
@@ -930,7 +930,7 @@ Tables below enumerate all the options and their defaults set by RTX Remix. Note
 |rtx.postfx.motionBlurMaskOutTextures|hash set||||Disable motion blur for meshes with specific texture\.|
 |rtx.rayPortalModelTextureHashes|hash vector||||Texture hashes identifying ray portals\. Allowed number of hashes: \{0, 2\}\.|
 |rtx.raytracedRenderTargetTextures|hash set||||DescriptorHashes for Render Targets\. \(Screens that should display the output of another camera\)\.|
-|rtx.remixMenuKeyBinds|virtual keys|ALT + X|||Hotkey to open the Remix menu\.<br>example override: 'rtx\.remixMenuKeyBinds = CTRL, SHIFT, Z'\.<br>Full list of key names available in \`src/util/util\_keybind\.h\`\.|
+|rtx.remixMenuKeyBinds|virtual keys|ALT,X|||Hotkey to open the Remix menu\.<br>example override: 'rtx\.remixMenuKeyBinds = CTRL, SHIFT, Z'\.<br>Full list of key names available in \`src/util/util\_keybind\.h\`\.|
 |rtx.singleOffsetDecalTextures|hash set||||Warning: This option is deprecated, please use rtx\.decalTextures instead\.<br>Textures on draw calls used for geometric decals that don't inter\-overlap for a given texture hash\. Textures must be tagged as "Decal Texture" or "Dynamic Decal Texture" to apply\.<br>Applies a single shared offset to all the batched decal geometry rendered in a given draw call, rather than increasing offset per decal within the batch \(i\.e\. a quad in case of "Dynamic Decal Texture"\)\.<br>Note, the offset adds to the global offset among all decals drawn with different draw calls\.<br>The decal textures tagged this way must not inter\-overlap within a batch / single draw call since the same offset is applied to all of them\.<br>Applying a single offset is useful for stabilizing decal offsets when a game dynamically batches decals together\.<br>In addition, it makes the global decal offset index grow slower and thus it minimizes a chance of hitting the "rtx\.decals\.maxOffsetIndex limit"\.|
 |rtx.skyBoxGeometries|hash set||||Geometries from draw calls used for the sky or are otherwise intended to be very far away from the camera at all times \(no parallax\)\.<br>Any draw calls using a geometry hash in this list will be treated as sky and rendered as such in a manner different from typical geometry\.<br>The geometry hash being used for sky detection is based off of the asset hash rule, see: "rtx\.geometryAssetHashRuleString"\.|
 |rtx.skyBoxTextures|hash set||||Textures on draw calls used for the sky or are otherwise intended to be very far away from the camera at all times \(no parallax\)\.<br>Any draw calls using a texture in this list will be treated as sky and rendered as such in a manner different from typical geometry\.|

src/dxvk/rtx_render/rtx_option.cpp

@@ -775,11 +775,17 @@ namespace dxvk {
     */
     GenericValueWrapper optionValue(type);
     float throughput = 1.0f;
+    bool layerMatchingRuntimePriorityFound = false;
     // Loop layers from highest priority to lowest to lerp the value across layers base on the blend strength of layers
     for (const auto& optionLayer : optionLayerValueQueue) {
-      // Skip options with runtime priority when ignoreChangedOption is true
-      if (ignoreChangedOption && optionLayer.second.priority == RtxOptionLayer::s_runtimeOptionLayerPriority) {
-        continue;
+      if (optionLayer.second.priority == RtxOptionLayer::s_runtimeOptionLayerPriority) {
+        if (ignoreChangedOption) {
+          // Skip options with runtime priority when ignoreChangedOption is true
+          continue;
+        }
+
+        // Changing this flag must happen after checking ignoreChangedOption, or the real-time changes will be mistakenly removed.
+        layerMatchingRuntimePriorityFound = true;
       }
 
       if (type == OptionType::Float || type == OptionType::Vector2 || type == OptionType::Vector3 || type == OptionType::Vector4) {
@@ -799,6 +805,39 @@ namespace dxvk {
       }
     }
 
+    // If a runtime option layer exists, recompute the resolved value without it
+    // to check whether the layer actually changes the final result. If the recomputed value
+    // matches the current resolved value, it means the real-time layer is redundant,
+    // so we remove (disable) it to avoid unnecessary layers and redundant blending.
+    if (layerMatchingRuntimePriorityFound) {
+      GenericValueWrapper originalResolvedValue(type);
+      for (const auto& optionLayer : optionLayerValueQueue) {
+        if (optionLayer.second.priority == RtxOptionLayer::s_runtimeOptionLayerPriority) {
+          continue;
+        }
+
+        if (type == OptionType::Float || type == OptionType::Vector2 || type == OptionType::Vector3 || type == OptionType::Vector4) {
+          // Stop when the blend strength is larger than 1, because lerp(a, b, 1.0f) => b, we don't need to loop lower priority values
+          if (optionLayer.second.blendStrength >= 1.0f) {
+            addWeightedValue(optionLayer.second.value, throughput, originalResolvedValue.data);
+            break;
+          }
+
+          addWeightedValue(optionLayer.second.value, optionLayer.second.blendStrength * throughput, originalResolvedValue.data);
+          throughput *= (1.0f - optionLayer.second.blendStrength);
+        } else {
+          if (optionLayer.second.blendStrength >= optionLayer.second.blendThreshold || optionLayer.second.priority == 0) {
+            addWeightedValue(optionLayer.second.value, throughput, originalResolvedValue.data);
+            break;
+          }
+        }
+      }
+
+      if (isEqual(originalResolvedValue.data, optionValue.data)) {
+        disableTopLayer();
+      }
+    }
+
     // Copy to resolvedValue
     copyValue(optionValue.data, value);
   }

src/util/config/config.cpp

@@ -1362,7 +1362,7 @@ namespace dxvk {
     std::string s;
     bool bFoundValidConfig = false;
     VirtualKeys virtKeys;
-    while (std::getline(ss, s, ',')) {
+    while (std::getline(ss, s, kVirtualKeyDelimiter)) {
       VirtualKey vk;
       try {
         // Strip whitespace from s

src/util/util_keybind.h

@@ -43,6 +43,8 @@ struct VirtualKey {
 };
 using VirtualKeys = std::vector<VirtualKey>;
 
+constexpr const char kVirtualKeyDelimiter = ',';
+
 class KeyBind {
 public:
     static std::string getName(const VirtualKey vk) {
@@ -346,7 +348,7 @@ static std::string buildKeyBindDescriptorString(const VirtualKeys& virtKeys) {
     bool bIsFirst = true;
     for(const auto& virtKey : virtKeys) {
         if(!bIsFirst) {
-            ss << " + ";
+            ss << kVirtualKeyDelimiter;
         }
         ss << KeyBind::getName(virtKey);
         bIsFirst = false;