[REMIX-4106] Implement Option Layer

Author: xbei-nv

src/dxvk/dxvk_instance.cpp

@@ -642,6 +642,9 @@ namespace dxvk {
     initConfig<Config::Type_RtxMod>();
 
     RtxOption<bool>::initializeRtxOptions();
+    for (const auto& optionLayer : RtxOptionImpl::getRtxOptionLayerMap()) {
+      RtxOption<bool>::addRtxOptionLayer(optionLayer);
+    }
 
     m_config.logOptions("Effective (combined)");
 
@@ -690,7 +693,7 @@ namespace dxvk {
         m_config.getOption<std::string>("rtx.baseGameModPathRegex", "", ""));
       if (baseGameModPath.empty()) {
         // Skip RtxMod if not present, as it may just pick up a different rtx.mod path
-        Logger::info("No base game mod path found. Skipping initilization.");
+        Logger::info("No base game mod path found. Skipping initialization.");
         return;
       } else {
         Logger::info(str::format("Found base game mod path: ", baseGameModPath));
@@ -704,11 +707,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.
       RtxOption<bool>::setStartupConfig(m_config);
+      RtxOptionImpl::getRtxOptionLayerMap().insert(RtxOptionLayer(m_config, "dxvk.conf", 1, 1.0f, 1.0f));
       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
       RtxOption<bool>::setCustomConfig(m_config);
+      RtxOptionImpl::getRtxOptionLayerMap().insert(RtxOptionLayer(m_config, "rtx.conf", 2, 1.0f, 1.0f));
       Logger::info("Set custom config.");
     }
   }

src/dxvk/imgui/dxvk_imgui.cpp

@@ -1104,7 +1104,9 @@ namespace dxvk {
 
     ImGui::SameLine();
     if (ImGui::Button("Reset Settings")) {
-      RtxOptions::reset();
+      for (auto& optionLayer : RtxOptionImpl::getRtxOptionLayerMap()) {
+        optionLayer.setEnabled(false);
+      }
     }
 
     ImGui::SameLine();
@@ -1975,6 +1977,54 @@ namespace dxvk {
         ImGui::Unindent();
       }
 #endif
+
+      if (ImGui::CollapsingHeader("Option Layers")) {
+        ImGui::Indent();
+
+        if (ImGui::Button("Reset runtime settings")) {
+          // Remove all run-time changed settings
+          RtxOptionLayer::setResetSettings(true);
+        }
+
+        uint32_t optionLayerCounter = 1;
+        for (auto& optionLayer : RtxOptionImpl::getRtxOptionLayerMap()) {
+          // Runtime option layer priority is reserved for real-time user changes.
+          // These layers should not be modified through the GUI.
+          if (optionLayer.getPriority() != RtxOptionLayer::s_runtimeOptionLayerPriority) {
+            ImGui::Dummy(ImVec2(0.0f, 5.0f));
+            const std::string optionLayerText = std::to_string(optionLayerCounter++) + ". " + optionLayer.getName();
+            const std::string optionLayerStrengthText = optionLayer.getName() + " Strength";
+            if (ImGui::Checkbox(optionLayerText.c_str(), &optionLayer.isEnabledRef())) {
+              optionLayer.setDirty(true);
+            }
+
+            if (IMGUI_ADD_TOOLTIP(ImGui::SliderFloat(optionLayerStrengthText.c_str(), &optionLayer.getBlendStrengthRef(), 0.0f, 1.0f),
+                                  "Adjusts the blending strength of this option layer (0 = off, 1 = full effect).")) {
+              optionLayer.setBlendStrengthDirty(true);
+            }
+
+            if (ImGui::CollapsingHeader((optionLayer.getName() + " Details").c_str(), collapsingHeaderClosedFlags)) {
+              ImGui::Indent();
+              const std::string priorityText = "Priority: " + std::to_string(optionLayer.getPriority());
+              ImGui::Text(priorityText.c_str());
+              if (ImGui::IsItemHovered()) {
+                ImGui::SetTooltip(
+                  "Layers are applied starting with the lowest priority layer, ending with the highest.\n"
+                  "Each layer overrides the values written before it.\n"
+                  "If a layer's blendWeight is not 1 and the option is a float or Vector type,\n"
+                  "then the values will be calculated as LERP(previousValue, layerValue, blendWeight).");
+              }
+              for (const auto& option : optionLayer.getConfig().getOptions()) {
+                const std::string optionText = option.first + "=" + option.second;
+                ImGui::TextWrapped(optionText.c_str());
+              }
+              ImGui::Unindent();
+            }
+          }
+        }
+
+        ImGui::Unindent();
+      }
     }
 
     ImGui::PopItemWidth();

src/dxvk/rtx_render/rtx_context.cpp

@@ -694,6 +694,7 @@ namespace dxvk {
     getSceneManager().clearFogState();
 
     // apply changes to RtxOptions after the frame has ended
+    RtxOption<bool>::applyPendingValuesOptionLayers();
     RtxOption<bool>::applyPendingValues(m_device.ptr());
 
     // Update stats