Merge branch 'dev/kslawicki/volumetric_quality_presets_fix' into 'main'

REMIX-5532 Fixes inverted/stale behavior for the RTX Volumetric Settings quality preset.

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

Author: nv-kslawicki

src/dxvk/imgui/dxvk_imgui_about.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) 2022-2026, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
@@ -131,6 +131,7 @@ namespace dxvk {
           "Jerran Schmidt",
           "Sascha Sertel",
           "Jeremy Shopf",
+          "Kamil Slawicki",
           "Nuno Subtil",
           "Ilya Terentiev",
           "Peter Thacker",

src/dxvk/rtx_render/rtx_global_volumetrics.cpp

@@ -172,6 +172,14 @@ namespace dxvk {
 
   RtxGlobalVolumetrics::RtxGlobalVolumetrics(DxvkDevice* device) : CommonDeviceObject(device), RtxPass(device) {}
 
+  void RtxGlobalVolumetrics::onFroxelResourceOptionsChanged(DxvkDevice* device) {
+    if (device == nullptr) {
+      return;
+    }
+
+    device->getCommon()->metaGlobalVolumetrics().m_rebuildFroxels = true;
+  }
+
   // Quality level presets, x component controls the froxelGridResolutionScale and the y component controls the froxelDepthSlices settings.
   static const int2 qualityModes[RtxGlobalVolumetrics::QualityLevel::QualityCount] = {
     int2(32, 48),
@@ -228,8 +236,8 @@ namespace dxvk {
       RemixGui::Checkbox("Show Advanced Options", &showAdvanced);
 
       if (showAdvanced) {
-        m_rebuildFroxels |= RemixGui::DragInt("Froxel Grid Resolution Scale", &froxelGridResolutionScaleObject(), 0.1f, 1);
-        m_rebuildFroxels |= RemixGui::DragInt("Froxel Depth Slices", &froxelDepthSlicesObject(), 0.1f, 1, UINT16_MAX);
+        RemixGui::DragInt("Froxel Grid Resolution Scale", &froxelGridResolutionScaleObject(), 0.1f, 1);
+        RemixGui::DragInt("Froxel Depth Slices", &froxelDepthSlicesObject(), 0.1f, 1, UINT16_MAX);
         RemixGui::DragInt("Max Accumulation Frames", &maxAccumulationFramesObject(), 0.1f, 1, UINT8_MAX);
         RemixGui::DragFloat("Froxel Depth Slice Distribution Exponent", &froxelDepthSliceDistributionExponentObject(), 0.01f, 0.0f, FLT_MAX, "%.3f", ImGuiSliderFlags_AlwaysClamp);
         RemixGui::DragFloat("Froxel Max Distance", &froxelMaxDistanceMetersObject(), 0.25f, 0.0f, FLT_MAX, "%.2f", ImGuiSliderFlags_AlwaysClamp);
@@ -242,8 +250,8 @@ namespace dxvk {
 
         ImGui::BeginDisabled(enableReferenceMode());
 
-        m_rebuildFroxels |= RemixGui::DragInt("Restir Grid Downsample Factor", &restirGridScaleObject(), 0.1f, 1);
-        m_rebuildFroxels |= RemixGui::DragInt("Restir Froxel Depth Slices", &restirFroxelDepthSlicesObject(), 0.1f, 1, UINT16_MAX);
+        RemixGui::DragInt("Restir Grid Downsample Factor", &restirGridScaleObject(), 0.1f, 1);
+        RemixGui::DragInt("Restir Froxel Depth Slices", &restirFroxelDepthSlicesObject(), 0.1f, 1, UINT16_MAX);
         RemixGui::DragFloat("Restir Guard Band Scale Factor", &restirGridGuardBandFactorObject(), 0.1f, 1.0f, FLT_MAX, "%.3f", ImGuiSliderFlags_AlwaysClamp);
 
         RemixGui::DragInt("Initial RIS Sample Count", &initialRISSampleCountObject(), 0.05f, 1, UINT8_MAX);
@@ -404,24 +412,8 @@ namespace dxvk {
       qualityPreset = qualityModes[desiredQualityLevel];
     }
 
-    // Set new values based on preset values and cache old values
-
-    const auto newFroxelGridResolutionScale = qualityPreset.x;
-    const auto newFroxelDepthSlices = qualityPreset.y;
-    const auto oldFroxelGridResolutionScale = froxelGridResolutionScale();
-    const auto oldFroxelDepthSlices = froxelDepthSlices();
-
-    froxelGridResolutionScale.setDeferred(newFroxelGridResolutionScale);
-    froxelDepthSlices.setDeferred(newFroxelDepthSlices);
-
-    // Indicate that the froxel resources should be rebuilt if any relevant values changed
-
-    if (
-      newFroxelGridResolutionScale != oldFroxelGridResolutionScale ||
-      newFroxelDepthSlices != oldFroxelDepthSlices
-    ) {
-      m_rebuildFroxels = true;
-    }
+    froxelGridResolutionScale.setDeferred(static_cast<uint32_t>(qualityPreset.x));
+    froxelDepthSlices.setDeferred(static_cast<uint16_t>(qualityPreset.y));
   }
 
   void RtxGlobalVolumetrics::setPreset(const PresetType presetType) {
@@ -798,7 +790,6 @@ namespace dxvk {
 
     if (m_rebuildFroxels) {
       createDownscaledResource(ctx, frameBeginCtx.downscaledExtent);
-      m_rebuildFroxels = false;
     }
   }
 
@@ -832,6 +823,8 @@ namespace dxvk {
 
     m_volumeReservoirs[0] = Resources::createImageResource(ctx, "volume reservoir 0", restirFroxelGridFullDimensions, VK_FORMAT_R32G32B32A32_UINT, 1, VK_IMAGE_TYPE_3D, VK_IMAGE_VIEW_TYPE_3D);
     m_volumeReservoirs[1] = Resources::createImageResource(ctx, "volume reservoir 1", restirFroxelGridFullDimensions, VK_FORMAT_R32G32B32A32_UINT, 1, VK_IMAGE_TYPE_3D, VK_IMAGE_VIEW_TYPE_3D);
+
+    m_rebuildFroxels = false;
   }
 
   void RtxGlobalVolumetrics::releaseDownscaledResource() {

src/dxvk/rtx_render/rtx_global_volumetrics.h

@@ -75,6 +75,8 @@ namespace dxvk {
         anisotropy(aniso) { }
     };
 
+    static void onFroxelResourceOptionsChanged(DxvkDevice* device);
+
     // Froxel Radiance Cache/Volumetric Lighting ptions
     // Note: The effective froxel grid resolution (based on the resolution scale) and froxelDepthSlices when multiplied together give the number of froxel cells, and this should be greater than the maximum number of
     // "concurrent" threads the GPU can execute at once to saturate execution and ensure maximal occupancy. This can be calculated by looking at how many warps per multiprocessor the GPU can have at once (This can
@@ -83,15 +85,16 @@ namespace dxvk {
     // Example for a RTX 3090: 82 SMs * 64 warps per SM * 32 threads per warp = 167,936 froxels to saturate the GPU. It is fine to be a bit below this though as most gpus will have fewer SMs than this, and higher resolutions
     // will also use more froxels due to how the grid is allocated with respect to the (downscaled when DLSS is in use) resolution, and we don't want the froxel passes to be too expensive (unless higher quality results are desired).
     RTX_OPTION("rtx.volumetrics", float, restirGridGuardBandFactor, 1.1f, "The scale factor for the restir grid guard band, which is an extended part of the viewing frustum for which we should calculate lighting information for, even though they are technically offscreen.  This helps reduce noise in cases where the camera is moving around.");
-    RTX_OPTION("rtx.volumetrics", uint32_t, restirGridScale, 4,
+    RTX_OPTION_ARGS("rtx.volumetrics", uint32_t, restirGridScale, 4,
                "The scale factor to divide the x and y froxel grid resolution by to determine the x and y dimensions of the ReSTIR froxel grid.\n"
-               "Note that unlike the rtx.volumetrics.froxelGridResolutionScale option this is not dividing the render resolution, but rather is a scalar on top of the resulting froxel grid resolution after it is divided by the resolution scale.");
+               "Note that unlike the rtx.volumetrics.froxelGridResolutionScale option this is not dividing the render resolution, but rather is a scalar on top of the resulting froxel grid resolution after it is divided by the resolution scale.",
+               args.onChangeCallback = &onFroxelResourceOptionsChanged);
     RTX_OPTION_ARGS("rtx.volumetrics", uint32_t, froxelGridResolutionScale, 8, "The scale factor to divide the x and y render resolution by to determine the x and y dimensions of the froxel grid.",
-                    args.minValue = static_cast<uint32_t>(1), args.flags = RtxOptionFlags::UserSetting);
+                    args.minValue = static_cast<uint32_t>(1), args.onChangeCallback = &onFroxelResourceOptionsChanged, args.flags = RtxOptionFlags::UserSetting);
     RTX_OPTION_ARGS("rtx.volumetrics", uint16_t, froxelDepthSlices, 64, "The z dimension of the froxel grid. Must be constant after initialization.",
-                    args.minValue = static_cast<uint16_t>(1), args.maxValue = std::numeric_limits<uint16_t>::max(), args.flags = RtxOptionFlags::UserSetting);
+                    args.minValue = static_cast<uint16_t>(1), args.maxValue = std::numeric_limits<uint16_t>::max(), args.onChangeCallback = &onFroxelResourceOptionsChanged, args.flags = RtxOptionFlags::UserSetting);
     RTX_OPTION_ARGS("rtx.volumetrics", uint16_t, restirFroxelDepthSlices, 128, "The z dimension of the ReSTIR froxel grid. Must be constant after initialization.",
-                    args.minValue = static_cast<uint16_t>(1), args.maxValue = std::numeric_limits<uint16_t>::max());
+                    args.minValue = static_cast<uint16_t>(1), args.maxValue = std::numeric_limits<uint16_t>::max(), args.onChangeCallback = &onFroxelResourceOptionsChanged);
     RTX_OPTION_ARGS("rtx.volumetrics", uint8_t, maxAccumulationFrames, 128,
                "The number of frames to accumulate volume lighting samples over, maximum of 254.\n"
                "Large values result in greater image stability at the cost of potentially more temporal lag."