Merge branch 'pkristof/evMinValueFix' into 'main'

Fixed clamping of ev min max values

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

Author: pkristof

RtxOptions.md

@@ -139,8 +139,8 @@ Tables below enumerate all the options and their defaults set by RTX Remix. Note
 |rtx.debugView.displayType|int|0|||The display type to use for visualizing debug view input values\.<br>Supported display types are: 0 = Standard, 1 = BGR Exclusive Color, 2 = EV100, 3 = HDR Waveform<br>Each mode may be useful for a different kind of visualization, though Standard is typically the most common mode to use\.<br>Standard mode works for a simple direct, scaled or color mapped visualization, BGR exclusive for another type of color mapped visualization, and EV100 or the HDR Waveform for understanding HDR value magnitudes in the input on a log scale\.|
 |rtx.debugView.enableGammaCorrection|bool|False|||Enables gamma correction of a debug view value\.|
 |rtx.debugView.enableInputQuantization|bool|False|||Enables uniform\-step input quantization on debug view input buffers\.<br>This is mostly useful for when debugging artifacts relating to quantization that may not be visible in a buffer due to higher precision formats in use\.<br>For example, the final output from tonemapping is a floating point texture in the debug view but will be quantized to 8 bit on some monitors\. Using this option the quantization which will be applied to the output can be visualized in advance\.|
-|rtx.debugView.evMaxValue|int|4|||The maximum EV100 debug view input value to map to the top of the visualization range when EV100 debug display is in use\. Values above this value in the input will be clamped to the top of the range\.|
-|rtx.debugView.evMinValue|int|-4|||The minimum EV100 debug view input value to map to the bottom of the visualization range when EV100 debug display is in use\. Values below this value in the input will be clamped to the bottom of the range\.|
+|rtx.debugView.evMaxValue|int|4|||The maximum EV100 debug view input value to map to the top of the visualization range when EV100 debug display is in use\.<br>Values above this value in the input will be clamped to the top of the range\.|
+|rtx.debugView.evMinValue|int|-4|||The minimum EV100 debug view input value to map to the bottom of the visualization range when EV100 debug display is in use\.<br>Values below this value in the input will be clamped to the bottom of the range\.|
 |rtx.debugView.gpuPrint.enable|bool|False|||Enables writing into a GPU buffer that's read by CPU when CTRL is pressed\. The value is printed to console\.|
 |rtx.debugView.gpuPrint.pixelIndex|int2|2147483647, 2147483647|||Pixel position to GPU print for\. Requires useMousePosition to be turned off\.|
 |rtx.debugView.gpuPrint.useMousePosition|bool|True|||Uses mouse position to select a pixel to GPU print for\.|

src/dxvk/rtx_render/rtx_debug_view.cpp

@@ -918,8 +918,6 @@ namespace dxvk {
         ImGui::InputInt("Min Value (EV100)", &evMinValueObject());
         ImGui::InputInt("Max Value (EV100)", &evMaxValueObject());
 
-        evMaxValue.setDeferred(std::max(evMaxValue(), evMinValue()));
-
         // Color legend
         {
           ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4 { 0.25f, 0.25f, 0.25f, 1.0f });
@@ -1675,14 +1673,22 @@ namespace dxvk {
   }
 
   void DebugView::maxValueOnChange(DxvkDevice* device) {
-    // If the max value is negative, we want the min value to be further away from 0.
+    // If the max value is negative, we want the min value to be further away from 0 than the max value
     const float factor = maxValue() > 0 ? 0.99999f : 1.00001f;
     minValueObject().setMaxValue(maxValue() * factor);
   }
 
   void DebugView::minValueOnChange(DxvkDevice* device) {
-    // If the min value is negative, we want the max value to be closer to 0.
+    // If the min value is negative, we want the max value to be closer to 0 than the min value
     const float factor = minValue() > 0 ? 1.00001f : 0.99999f;
     maxValueObject().setMinValue(minValue() * factor);
   }
+
+  void DebugView::evMinValueOnChange(DxvkDevice* device) {
+    evMaxValueObject().setMinValue(evMaxValue());
+  }
+
+  void DebugView::evMaxValueOnChange(DxvkDevice* device) {
+    evMinValueObject().setMaxValue(evMinValue());
+  } 
 } // namespace dxvk

src/dxvk/rtx_render/rtx_debug_view.h

@@ -164,22 +164,33 @@ namespace dxvk {
     bool m_enableAlphaChannel = false;
     float m_scale = 1.f;
 
-    public: static void maxValueOnChange(DxvkDevice* device);
+    public: static void minValueOnChange(DxvkDevice* device);
     RTX_OPTION_ARGS("rtx.debugView", float, minValue, 0.f,
       "The minimum debug view input value to map to 0 in the output when the standard debug display is in use. Values below this value in the input will be clamped to 0 in the output.",
       args.environment = "DXVK_RTX_DEBUG_VIEW_MIN_VALUE",
-      args.onChangeCallback = &maxValueOnChange);
+      args.onChangeCallback = &minValueOnChange);
 
-    public: static void minValueOnChange(DxvkDevice* device);
+    public: static void maxValueOnChange(DxvkDevice* device);
     RTX_OPTION_ARGS("rtx.debugView", float, maxValue, 1.f,
       "The maximum debug view input value to map to 1 in the output when the standard debug display is in use. Values above this value in the input will be clamped to 1 in the output.",
       args.environment = "DXVK_RTX_DEBUG_VIEW_MAX_VALUE",
-      args.onChangeCallback = &minValueOnChange);
+      args.onChangeCallback = &maxValueOnChange);
 
 
     // EV100 Display
-    RTX_OPTION_ENV("rtx.debugView", int32_t, evMinValue, -4, "DXVK_RTX_DEBUG_VIEW_EV_MIN_VALUE", "The minimum EV100 debug view input value to map to the bottom of the visualization range when EV100 debug display is in use. Values below this value in the input will be clamped to the bottom of the range.");
-    RTX_OPTION_ENV("rtx.debugView", int32_t, evMaxValue, 4, "DXVK_RTX_DEBUG_VIEW_EV_MAX_VALUE", "The maximum EV100 debug view input value to map to the top of the visualization range when EV100 debug display is in use. Values above this value in the input will be clamped to the top of the range.")
+    public: static void evMinValueOnChange(DxvkDevice* device);
+    RTX_OPTION_ARGS("rtx.debugView", int32_t, evMinValue, -4, 
+                    "The minimum EV100 debug view input value to map to the bottom of the visualization range when EV100 debug display is in use.\n"
+                    "Values below this value in the input will be clamped to the bottom of the range.",
+                    args.environment = "DXVK_RTX_DEBUG_VIEW_EV_MIN_VALUE",
+                    args.onChangeCallback = &evMinValueOnChange);
+
+    public: static void evMaxValueOnChange(DxvkDevice* device);
+    RTX_OPTION_ARGS("rtx.debugView", int32_t, evMaxValue, 4, 
+                    "The maximum EV100 debug view input value to map to the top of the visualization range when EV100 debug display is in use.\n"
+                    "Values above this value in the input will be clamped to the top of the range.",
+                    args.environment = "DXVK_RTX_DEBUG_VIEW_EV_MAX_VALUE",
+                    args.onChangeCallback = &evMaxValueOnChange);
 
     struct Accumulation {
       RTX_OPTION_ENV("rtx.debugView.accumulation", bool, enable, false, "RTX_DEBUG_VIEW_ACCUMULATION_ENABLE",