Merge branch 'REMIX-4761-rtxOptionLayerPriority' into 'main'

[REMIX-4761] Refactor layer priorities to be more user friendly.

Closes REMIX-4761

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

Author: MarkEHenderson

documentation/components/ConstFloat.md

@@ -1,11 +1,11 @@
-# Constant Float
+# Constant Number
 
 Provides a constant decimal number that you can set\.<br/><br/>Use this to provide fixed values like 0\.5, 3\.14, or 100\.0 to other components\.
 
 ## Component Information
 
 - **Name:** `ConstFloat`
-- **UI Name:** Constant Float
+- **UI Name:** Constant Number
 - **Version:** 1
 - **Categories:** Constants
 

documentation/components/CountToggles.md

@@ -41,11 +41,11 @@ The value of the boolean from the previous frame\.
 
 | Property | Display Name | Type | IO Type | Default Value | Optional |
 |----------|--------------|------|---------|---------------|----------|
-| count | Count as Float | Float | Output | 0\.0 | No | 
+| count | Count | Float | Output | 0\.0 | No | 
 
-### Count as Float
+### Count
 
-The current count value as a float\.
+The current count value\.
 
 
 ## Usage Notes

documentation/components/MeshProximity.md

@@ -31,12 +31,12 @@ The world space position to test against the mesh bounding box\.
 
 ### Inactive Distance
 
-The distance inside the bounding box that corresponds to a normalized value of 0\.0\.  Negative numbers represent values outside the AABB\. 
+The distance inside the bounding box that corresponds to a normalized value of 0\.0\.  Positive numbers represent values outside the AABB\. 
 
 
 ### Full Activation Distance
 
-The distance inside the bounding box that corresponds to a normalized value of 1\.0\.  Negative numbers represent values outside the AABB\. 
+The distance inside the bounding box that corresponds to a normalized value of 1\.0\.  Positive numbers represent values outside the AABB\. 
 
 
 ### Easing Type

documentation/components/RtxOptionLayerAction.md

@@ -1,6 +1,6 @@
 # Rtx Option Layer Action
 
-Activates and controls configuration layers at runtime based on game conditions\.<br/><br/>Controls an RtxOptionLayer by name, allowing dynamic enable/disable, strength adjustment, and threshold control\. This can be used to activate configuration layers at runtime based on game state or other conditions\.<br/><br/>The layer is created if it doesn't exist, and managed with reference counting\. Each layer requires a unique priority value \- if multiple components specify the same priority, an error will occur\.
+Activates and controls configuration layers at runtime based on game conditions\.<br/><br/>Controls an RtxOptionLayer by name, allowing dynamic enable/disable, strength adjustment, and threshold control\. This can be used to activate configuration layers at runtime based on game state or other conditions\.<br/><br/>The layer is created if it doesn't exist, and managed with reference counting\.<br/>If two components specify the same priority and config path, they will both control the same layer \(for enabled components, uses the MAX of the blend strengths and the MIN of the blend thresholds\)\.<br/>If two components specify the same priority but different config paths, the layers will be prioritized alphabetically \(a\.conf will override values from z\.conf\)\.
 
 ## Component Information
 
@@ -51,7 +51,7 @@ The blend threshold for non\-float options \(0\.0 to 1\.0\)\. Non\-float options
 
 ### Priority
 
-The priority for the option layer\. Numbers are rounded to the nearest positive integer\. Higher values are blended on top of lower values\. Must be unique across all layers\.
+The priority for the option layer\. Numbers are rounded to the nearest positive integer\. Higher values are blended on top of lower values\. If two components specify the same priority but different config paths, the layers will be prioritized alphabetically \(a\.conf will override values from z\.conf\)\.
 
 
 **Value Constraints:**

documentation/components/RtxOptionLayerSensor.md

@@ -23,7 +23,7 @@ The config file for the RtxOptionLayer to read\.
 
 ### Priority
 
-The priority for the option layer\. Numbers are rounded to the nearest positive integer\. Higher values are blended on top of lower values\. Must be unique across all layers\.
+The priority for the option layer\. Numbers are rounded to the nearest positive integer\. Higher values are blended on top of lower values\. If multiple layers share the same priority, they are ordered alphabetically by config path\.
 
 
 **Value Constraints:**

documentation/components/index.md

@@ -86,11 +86,11 @@ This documentation provides detailed information about all available components
 | [Constant Bool](ConstBool.md) | Provides a constant true or false value that you can set\.<br/><br/>Use this to provide fixed on/off, yes/no,\.\.\. | 1 |
 | [Constant Color3](ConstColor3.md) | Provides a constant RGB color \(Red, Green, Blue\) that you can set\.<br/><br/>Use this to provide fixed colors\.\.\. | 1 |
 | [Constant Color4](ConstColor4.md) | Provides a constant RGBA color \(Red, Green, Blue, Alpha\) that you can set\.<br/><br/>Use this for fixed color\.\.\. | 1 |
-| [Constant Float](ConstFloat.md) | Provides a constant decimal number that you can set\.<br/><br/>Use this to provide fixed values like 0\.5, 3\.1\.\.\. | 1 |
 | [Constant Float2](ConstFloat2.md) | Provides a constant 2D vector \(two numbers: X and Y\) that you can set\.<br/><br/>Use this for fixed 2D coordi\.\.\. | 1 |
 | [Constant Float3](ConstFloat3.md) | Provides a constant 3D vector \(three numbers: X, Y, Z\) that you can set\.<br/><br/>Use this for fixed 3D posi\.\.\. | 1 |
 | [Constant Float4](ConstFloat4.md) | Provides a constant 4D vector \(four numbers: X, Y, Z, W\) that you can set\. | 1 |
 | [Constant Hash](ConstHash.md) | Provides a constant hash value that you can set\.<br/><br/>Use this to provide fixed hash identifiers for mes\.\.\. | 1 |
+| [Constant Number](ConstFloat.md) | Provides a constant decimal number that you can set\.<br/><br/>Use this to provide fixed values like 0\.5, 3\.1\.\.\. | 1 |
 | [Constant Prim](ConstPrim.md) | Provides a constant reference to a scene object \(prim\) that you can set\.<br/><br/>Use this to provide fixed \.\.\. | 1 |
 | [Constant String](ConstString.md) | Provides a constant text string that you can set\.<br/><br/>Use this to provide fixed text values, labels, or\.\.\. | 1 |
 

src/dxvk/dxvk_instance.cpp

@@ -641,15 +641,15 @@ namespace dxvk {
     initConfig<Config::Type_RtxUser>();
     initConfig<Config::Type_RtxMod>();
 
-    RtxOptionImpl::addRtxOptionLayer("quality.conf", (uint32_t) RtxOptionLayer::SystemLayerPriority::Quality, true, 1.0f, 1.0f);
+    RtxOptionImpl::addRtxOptionLayer("quality.conf", (uint32_t) RtxOptionLayer::SystemLayerPriority::Quality, true, 1.0f, 0.1f);
     Logger::info("Set quality configs.");
 
-    RtxOptionImpl::addRtxOptionLayer("user.conf", (uint32_t) RtxOptionLayer::SystemLayerPriority::USER, true, 1.0f, 1.0f);
+    RtxOptionImpl::addRtxOptionLayer("user.conf", (uint32_t) RtxOptionLayer::SystemLayerPriority::USER, true, 1.0f, 0.1f);
     Logger::info("Set user realtime configs.");
 
     RtxOptionManager::initializeRtxOptions();
-    for (const auto& [priority, optionLayer] : RtxOptionImpl::getRtxOptionLayerMap()) {
-      RtxOptionManager::addRtxOptionLayer(optionLayer);
+    for (const auto& [unusedLayerKey, optionLayerPtr] : RtxOptionImpl::getRtxOptionLayerMap()) {
+      RtxOptionManager::addRtxOptionLayer(*optionLayerPtr);
     }
 
     m_config.logOptions("Effective (combined)");
@@ -714,13 +714,13 @@ namespace dxvk {
       // Set config so that any rtx option initialized later will use the value in that config object
       // The start-up config contains the values from the code and dxvk.conf, only.
       RtxOptionManager::setStartupConfig(m_config);
-      RtxOptionImpl::addRtxOptionLayer("dxvk.conf", (uint32_t)RtxOptionLayer::SystemLayerPriority::DxvkConf, true, 1.0f, 1.0f, &m_config);
+      RtxOptionImpl::addRtxOptionLayer("dxvk.conf", (uint32_t)RtxOptionLayer::SystemLayerPriority::DxvkConf, true, 1.0f, 0.1f, &m_config);
       Logger::info("Set startup config.");
     } else if constexpr ((type == Config::Type_RtxUser) || (type == Config::Type_RtxMod)) {
       // Set custom config after the RTX user config has been merged into the config and
       // update the RTX options. Contains values from rtx.conf
       RtxOptionManager::setCustomConfig(m_config);
-      RtxOptionImpl::addRtxOptionLayer("rtx.conf", (uint32_t)RtxOptionLayer::SystemLayerPriority::RtxConf, true, 1.0f, 1.0f, nullptr);
+      RtxOptionImpl::addRtxOptionLayer("rtx.conf", (uint32_t)RtxOptionLayer::SystemLayerPriority::RtxConf, true, 1.0f, 0.1f, nullptr);
       Logger::info("Set custom config.");
     }
   }

src/dxvk/imgui/dxvk_imgui.cpp

@@ -2095,25 +2095,26 @@ namespace dxvk {
         ImGui::Indent();
 
         if (IMGUI_ADD_TOOLTIP(ImGui::Button("Disable Layers"), "Reset all settings to Default.")) {
-          for (auto& [priority, optionLayer] : RtxOptionImpl::getRtxOptionLayerMap()) {
-            optionLayer.requestEnabled(false);
+          for (auto& [unusedLayerKey, optionLayerPtr] : RtxOptionImpl::getRtxOptionLayerMap()) {
+            optionLayerPtr->requestEnabled(false);
           }
         }
 
         ImGui::SameLine();
         if (IMGUI_ADD_TOOLTIP(ImGui::Button("Enable Layers"), "Enable all option layers.")) {
-          for (auto& [priority, optionLayer] : RtxOptionImpl::getRtxOptionLayerMap()) {
-            optionLayer.requestEnabled(true);
+          for (auto& [unusedLayerKey, optionLayerPtr] : RtxOptionImpl::getRtxOptionLayerMap()) {
+            optionLayerPtr->requestEnabled(true);
           }
         }
 
         ImGui::Checkbox("Override configs", &RtxOptions::Option::overwriteConfigObject());
 
         uint32_t optionLayerCounter = 1;
-        for (auto& [priority, optionLayer] : RtxOptionImpl::getRtxOptionLayerMap()) {
+        for (auto& [layerKey, optionLayerPtr] : RtxOptionImpl::getRtxOptionLayerMap()) {
           // Runtime option layer priority is reserved for real-time user changes.
           // These layers should not be modified through the GUI.
-          if (priority != RtxOptionLayer::s_runtimeOptionLayerPriority) {
+          if (layerKey.priority != RtxOptionLayer::s_runtimeOptionLayerPriority) {
+            RtxOptionLayer& optionLayer = *optionLayerPtr;
             ImGui::Dummy(ImVec2(0.0f, 5.0f));
             ImGui::Separator();
             ImGui::Dummy(ImVec2(0.0f, 5.0f));

src/dxvk/rtx_render/graph/components/const_float.h

@@ -37,7 +37,7 @@ namespace components {
 
 REMIX_COMPONENT( \
   /* the Component name */ ConstFloat, \
-  /* the UI name */        "Constant Float", \
+  /* the UI name */        "Constant Number", \
   /* the UI categories */  "Constants", \
   /* the doc string */     "Provides a constant decimal number that you can set.\n\n" \
     "Use this to provide fixed values like 0.5, 3.14, or 100.0 to other components.", \

src/dxvk/rtx_render/graph/components/count_toggles.h

@@ -36,7 +36,7 @@ namespace components {
   X(RtComponentPropertyType::Bool, true, prevFrameValue, "", "The value of the boolean from the previous frame.")
 
 #define LIST_OUTPUTS(X) \
-  X(RtComponentPropertyType::Float, 0.0f, count, "Count as Float", "The current count value as a float.")
+  X(RtComponentPropertyType::Float, 0.0f, count, "Count", "The current count value.")
 
 
 REMIX_COMPONENT( \