Merge branch 'REMIX-4728-rtx-option-exploration' into 'main'

[REMIX-4728] Fixing a small bug in auto-adjusting min/max ranges on the debug view evMin/evMax. Additionally making sure that when adding a run-time option layer that it is initialized with the current highest priority layer value. This prevents min/max value clamp limit changes from dirtying an option. Moving some indiscriminate RtxOption setting to be triggered by state changes.

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

Author: nv-jshopf

src/dxvk/rtx_render/rtx_debug_view.cpp

@@ -1685,10 +1685,12 @@ namespace dxvk {
   }
 
   void DebugView::evMinValueOnChange(DxvkDevice* device) {
-    evMaxValueObject().setMinValue(evMaxValue());
+    // Adjust valid range on evMax to prevent inverted values
+    evMaxValueObject().setMinValue(evMinValue());
   }
 
   void DebugView::evMaxValueOnChange(DxvkDevice* device) {
-    evMinValueObject().setMaxValue(evMinValue());
+    // Adjust valid range on evMin to prevent inverted values
+    evMinValueObject().setMaxValue(evMaxValue());
   } 
 } // namespace dxvk

src/dxvk/rtx_render/rtx_neural_radiance_cache.cpp

@@ -540,11 +540,12 @@ namespace dxvk {
       // when changing resolutions
       || frameBeginCtx.downscaledExtent.width != m_nrcCtxSettings->frameDimensions.x
       || frameBeginCtx.downscaledExtent.height != m_nrcCtxSettings->frameDimensions.y;
-    
-    NrcCtxOptions::enableDebugBuffers.setDeferred(m_delayedEnableDebugBuffers);
-    NrcCtxOptions::enableCustomNetworkConfig.setDeferred(m_delayedEnableCustomNetworkConfig);
 
     if (reinitializeNrcContext) {
+
+      NrcCtxOptions::enableDebugBuffers.setDeferred(m_delayedEnableDebugBuffers);
+      NrcCtxOptions::enableCustomNetworkConfig.setDeferred(m_delayedEnableCustomNetworkConfig);
+
       m_nrcCtx = new NrcContext(*ctx->getDevice());
 
       if (m_nrcCtx->initialize() != nrc::Status::OK) {
@@ -1115,8 +1116,10 @@ namespace dxvk {
       return;
     }
 
-    m_resetHistory = false;
-    NrcOptions::resetHistory.setDeferred(false);
+    if (m_resetHistory) {
+      NrcOptions::resetHistory.setDeferred(false);
+      m_resetHistory = false;
+    }
 
     m_nrcCtx->endFrame();
   }

src/dxvk/rtx_render/rtx_option.cpp

@@ -283,7 +283,7 @@ namespace dxvk {
   GenericValue& RtxOptionImpl::getGenericValue(const ValueType valueType) {
     // Insert runtime layer if it's missing and user request runtime changes.
     if (optionLayerValueQueue.size() > 0 && optionLayerValueQueue.begin()->second.priority != RtxOptionLayer::s_runtimeOptionLayerPriority) {
-      insertEmptyOptionLayer(RtxOptionLayer::s_runtimeOptionLayerPriority, 1.0f, 1.0f);
+      insertOptionLayerValue(optionLayerValueQueue[0].value, RtxOptionLayer::s_runtimeOptionLayerPriority, 1.0f, 1.0f);
     }
 
     // Reuse the const overload to avoid duplicating switch logic.