Merge branch 'RtxOptionFixes' into 'main'

[REMIX-4852] fix RtxOptions that would not save (or load) correctly

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

Author: MarkEHenderson

RtxOptions.md

@@ -622,11 +622,6 @@ namespace dxvk {
   , m_about  (new ImGuiAbout)
   , m_splash  (new ImGuiSplash)
   , m_graphGUI  (new RtxGraphGUI) {
-    // Clamp Option ranges
-
-    RTX_OPTION_CLAMP(reflexStatRangeInterpolationRate, 0.0f, 1.0f);
-    RTX_OPTION_CLAMP_MIN(reflexStatRangePaddingRatio, 0.0f);
-
     // Set up constant state
     m_rsState.polygonMode       = VK_POLYGON_MODE_FILL;
     m_rsState.cullMode          = VK_CULL_MODE_BACK_BIT;

src/dxvk/imgui/dxvk_imgui.cpp

@@ -284,8 +284,10 @@ namespace dxvk {
     RTX_OPTION("rtx.gui", bool, showLegacyTextureGui, false, "A setting to toggle the old texture selection GUI, where each texture category is represented as its own list.");
     RTX_OPTION("rtx.gui", bool, legacyTextureGuiShowAssignedOnly, false, "A setting to show only the textures in a category that are assigned to it (Unassigned textures are found in the new \"Uncategorized\" list at the top).\nRequires: \'Split Texture Category List\' option to be enabled.");
     RTX_OPTION("rtx.gui", std::uint32_t, hudMessageAnimatedDotDurationMilliseconds, 1000, "A duration in milliseconds between each dot in the animated dot sequence for HUD messages. Must be greater than 0.\nThese dots help indicate progress is happening to the user with a bit of animation which can be configured to animate at whatever speed is desired.");
-    RTX_OPTION("rtx.gui", float, reflexStatRangeInterpolationRate, 0.05f, "A value controlling the interpolation rate applied to the Reflex stat graph ranges for smoother visualization.");
-    RTX_OPTION("rtx.gui", float, reflexStatRangePaddingRatio, 0.05f, "A value specifying the amount of padding applied to the Reflex stat graph ranges as a ratio to the calculated range.");
+    RTX_OPTION_ARGS("rtx.gui", float, reflexStatRangeInterpolationRate, 0.05f, "A value controlling the interpolation rate applied to the Reflex stat graph ranges for smoother visualization.",
+                    args.minValue = 0.0f, args.maxValue = 1.0f);
+    RTX_OPTION_ARGS("rtx.gui", float, reflexStatRangePaddingRatio, 0.05f, "A value specifying the amount of padding applied to the Reflex stat graph ranges as a ratio to the calculated range.",
+                    args.minValue = 0.0f);
 
     public: static void onThemeChange(DxvkDevice* device);
     public: static void onBackgroundAlphaChange(DxvkDevice* device);

src/dxvk/imgui/dxvk_imgui.h

@@ -173,21 +173,6 @@ namespace dxvk {
   RtxGlobalVolumetrics::RtxGlobalVolumetrics(DxvkDevice* device) : CommonDeviceObject(device), RtxPass(device) {
     // Volumetrics Options
 
-    RTX_OPTION_CLAMP_MIN(froxelGridResolutionScale, static_cast<uint32_t>(1));
-    RTX_OPTION_CLAMP(froxelDepthSlices, static_cast<uint16_t>(1), std::numeric_limits<uint16_t>::max());
-    RTX_OPTION_CLAMP(restirFroxelDepthSlices, static_cast<uint16_t>(1), std::numeric_limits<uint16_t>::max());
-    RTX_OPTION_CLAMP(maxAccumulationFrames, static_cast<uint8_t>(1), std::numeric_limits<uint8_t>::max());
-    RTX_OPTION_CLAMP_MIN(froxelDepthSliceDistributionExponent, 1e-4f);
-    RTX_OPTION_CLAMP_MIN(froxelMaxDistanceMeters, 0.0f);
-    // Note: Clamp to positive values as negative luminance thresholds are not valid.
-    RTX_OPTION_CLAMP_MIN(froxelFireflyFilteringLuminanceThreshold, 0.0f);
-
-    RTX_OPTION_CLAMP_MIN(initialRISSampleCount, static_cast<uint32_t>(1));
-    RTX_OPTION_CLAMP(temporalReuseMaxSampleCount, static_cast<uint16_t>(1), std::numeric_limits<uint16_t>::max());
-
-    RTX_OPTION_CLAMP_MIN(transmittanceMeasurementDistanceMeters, 0.0f);
-    RTX_OPTION_CLAMP(anisotropy, -1.0f, 1.0f);
-
     transmittanceColor.setDeferred(Vector3(
       std::clamp(transmittanceColor().x, 0.0f, 1.0f),
       std::clamp(transmittanceColor().y, 0.0f, 1.0f),
@@ -197,21 +182,6 @@ namespace dxvk {
       std::clamp(singleScatteringAlbedo().y, 0.0f, 1.0f),
       std::clamp(singleScatteringAlbedo().z, 0.0f, 1.0f)));
 
-    RTX_OPTION_CLAMP_MIN(noiseFieldSubStepSizeMeters, 0.0f);
-    RTX_OPTION_CLAMP_MIN(noiseFieldTimeScale, 0.0f);
-    RTX_OPTION_CLAMP_MIN(noiseFieldDensityScale, 0.0f);
-    RTX_OPTION_CLAMP_MIN(noiseFieldDensityExponent, 0.0f);
-    RTX_OPTION_CLAMP(noiseFieldOctaves, static_cast<uint32_t>(1), static_cast<uint32_t>(8));
-    RTX_OPTION_CLAMP_MIN(noiseFieldInitialFrequencyPerMeter, 0.0f);
-    RTX_OPTION_CLAMP_MIN(noiseFieldLacunarity, 0.0f);
-    RTX_OPTION_CLAMP_MIN(noiseFieldGain, 0.0f);
-
-    RTX_OPTION_CLAMP_MIN(fogRemapMaxDistanceMinMeters, 0.0f);
-    RTX_OPTION_CLAMP_MIN(fogRemapMaxDistanceMaxMeters, 0.0f);
-    RTX_OPTION_CLAMP_MIN(fogRemapTransmittanceMeasurementDistanceMinMeters, 0.0f);
-    RTX_OPTION_CLAMP_MIN(fogRemapTransmittanceMeasurementDistanceMaxMeters, 0.0f);
-    RTX_OPTION_CLAMP_MIN(fogRemapColorMultiscatteringScale, 0.0f);
-
     fogRemapMaxDistanceMinMeters.setDeferred(std::min(fogRemapMaxDistanceMinMeters(), fogRemapMaxDistanceMaxMeters()));
     fogRemapMaxDistanceMaxMeters.setDeferred(std::max(fogRemapMaxDistanceMinMeters(), fogRemapMaxDistanceMaxMeters()));
     fogRemapTransmittanceMeasurementDistanceMinMeters.setDeferred(std::min(fogRemapTransmittanceMeasurementDistanceMinMeters(), fogRemapTransmittanceMeasurementDistanceMaxMeters()));