Merge branch 'pkristof/rr4.5' into 'main'

[REMIX-5655, REMIX-5656] Updated DLSS SR & RR to 4.5 (310.7.128)

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

Author: pkristof

RtxOptions.md

@@ -175,6 +175,7 @@ This file is auto-generated by RTX Remix. To regenerate it, run Remix with `DXVK
 |rtx.dlfg.enable|bool|True|||Enables DLSS 3\.0 frame generation which generates interpolated frames to increase framerate at the cost of slightly more latency\.|
 |rtx.dlfg.enablePresentMetering|bool|True|||Use hardware present metering for DLSS 4\.0 frame generation instead of CPU pacing\.|
 |rtx.dlfg.maxInterpolatedFrames|int|2|1|6|For DLSS 4\.5 frame generation, controls the number of interpolated frames for each rendered frame\. Ignored for DLSS 3\.0\.|
+|rtx.dlss.preset|int|0|||Render preset for DLSS Super Resolution\. Default = 0 \(DLSS picks the best preset\), J = 10, K = 11, L = 12, M = 13\.|
 |rtx.dlssEnhancementDirectLightMaxValue|float|10|||The maximum strength of direct lighting enhancement\.|
 |rtx.dlssEnhancementDirectLightPower|float|0.7|||The overall strength of direct lighting enhancement\.|
 |rtx.dlssEnhancementIndirectLightMaxValue|float|1.5|||The maximum strength of indirect lighting enhancement\.|
@@ -618,13 +619,12 @@ This file is auto-generated by RTX Remix. To regenerate it, run Remix with `DXVK
 |rtx.rayreconstruction.enableDetailEnhancement|bool|True|||Enable detail enhancement filter to enhance normal map details\.<br>|
 |rtx.rayreconstruction.enableDisocclusionMaskBlur|bool|False|||Enables blurring of disocclusion mask to suppress instabilities due to abrupt mask value changes\.|
 |rtx.rayreconstruction.enableNRDForTraining|bool|False|||Enable NRD\. This option is only for training or debug purpose\.<br>|
-|rtx.rayreconstruction.enableTransformerModelD|bool|False||||
 |rtx.rayreconstruction.invalidateHistoryForAnimatedWater|bool|False|||Adds animated water surfaces to the disocclusion mask, making DLSS Ray Reconstruction discard their temporal history every frame\.<br>This suppresses ghosting from the water's per\-frame normal variation, but can introduce shimmering on objects seen through or near the water, so it is disabled by default\.<br>Enable it for content whose animated water ghosts noticeably\.|
-|rtx.rayreconstruction.model|int|1|||Ray reconstruction model to use\. 0: CNN, 1: Transformer \(higher quality\)\.|
 |rtx.rayreconstruction.particleBufferMode|int|1|||Use a separate particle buffer to handle particles\.<br>|
 |rtx.rayreconstruction.pathTracerPreset|int|1|||Path tracer preset to use when Ray Reconstruction is enabled\.|
 |rtx.rayreconstruction.preprocessSecondarySignal|bool|True|||Denoise secondary signal before passing to DLSS\-RR\. This option improves reflection on translucent objects\.<br>|
 |rtx.rayreconstruction.preserveSettingsInNativeMode|bool|False|||Preserve settings when switched to native mode, otherwise the default preset will be applied\.<br>|
+|rtx.rayreconstruction.preset|int|0|||Render preset for Ray Reconstruction\. Default = 0 \(DLSS picks the best preset\), D = 4, E = 5, F = 6\.|
 |rtx.rayreconstruction.upscalerRoughnessDemodulationMultiplier|float|0.15|||Multiplier of upscaler roughness demodulation to suppress noise\. Only used by DLSS\-RR\.|
 |rtx.rayreconstruction.upscalerRoughnessDemodulationOffset|float|1.5|||Strength of upscaler roughness demodulation\. Only used by DLSS\-RR\.|
 |rtx.rayreconstruction.useSpecularHitDistance|bool|True|||Use specular hit distance to reduce ghosting\.<br>|

packman-external.xml

@@ -33,7 +33,7 @@
 	    <package name="rtx-remix-ngx_sdk_dlfg" version="4" />
 	</dependency>
 	<dependency name="ngx_sdk_dldn" linkPath="external/ngx_sdk_dldn">
-	    <package name="rtx-remix-ngx_sdk_dldn" version="5" />
+	    <package name="rtx-remix-ngx_sdk_dldn" version="7" />
 	</dependency>
 	<dependency name="nrd" linkPath="external/nrd">
 	    <package name="rtx-remix-nrd" version="4.13" />

src/dxvk/imgui/dxvk_imgui.cpp

@@ -311,6 +311,19 @@ namespace dxvk {
     } }
   };
 
+  // Note: named 'dlssRenderPresetCombo' to avoid colliding with the user-menu 'dlssPresetCombo'
+  // (the combined On/Off/Custom preset).
+  RemixGui::ComboWithKey<DxvkDLSS::DLSSPreset> dlssRenderPresetCombo{
+    "DLSS SR Preset",
+    RemixGui::ComboWithKey<DxvkDLSS::DLSSPreset>::ComboEntries{ {
+        {DxvkDLSS::DLSSPreset::Default, "Default", "Let DLSS pick the best preset per quality mode."},
+        {DxvkDLSS::DLSSPreset::J, "J", "Similar to preset K, but may show slightly less ghosting at the cost of extra flickering. Preset K is generally recommended over J."},
+        {DxvkDLSS::DLSSPreset::K, "K", "Transformer-based default for DLAA/Balanced/Quality modes. Best image quality at a higher performance cost."},
+        {DxvkDLSS::DLSSPreset::L, "L", "Default for Ultra Performance mode."},
+        {DxvkDLSS::DLSSPreset::M, "M", "Default for Performance mode."},
+    } }
+  };
+
   RemixGui::ComboWithKey<XeSSPreset> xessPresetCombo{
     "XeSS Preset",
     RemixGui::ComboWithKey<XeSSPreset>::ComboEntries{ {
@@ -349,12 +362,15 @@ namespace dxvk {
     } }
   };
 
-  static auto rayReconstructionModelCombo = RemixGui::ComboWithKey<DxvkRayReconstruction::RayReconstructionModel>(
-    "Ray Reconstruction Model",
+  RemixGui::ComboWithKey<DxvkRayReconstruction::RayReconstructionPreset> rayReconstructionPresetCombo {
+    "DLSS RR Preset",
     { {
-      {DxvkRayReconstruction::RayReconstructionModel::Transformer, "Transformer", "Ensures highest image quality. Can be more expensive than CNN in terms of memory and performance."},
-      {DxvkRayReconstruction::RayReconstructionModel::CNN, "CNN", "Ensures great image quality"},
-  } });
+      { DxvkRayReconstruction::RayReconstructionPreset::Default, "Default", "Let DLSS pick the best preset per quality mode." },
+      { DxvkRayReconstruction::RayReconstructionPreset::D,       "D",       "Transformer model." },
+      { DxvkRayReconstruction::RayReconstructionPreset::E,       "E",       "Latest transformer model." },
+      { DxvkRayReconstruction::RayReconstructionPreset::F,       "F",       "Default RR2 model." },
+    } }
+  };
 
   RemixGui::ComboWithKey<int> dlfgMfgModeCombo {
     "DLSS Frame Generation Mode",
@@ -517,7 +533,7 @@ namespace dxvk {
       changed = RemixGui::Checkbox("Ray Reconstruction", &RtxOptions::enableRayReconstructionObject());
 
       if (RtxOptions::enableRayReconstruction()) {
-        rayReconstructionModelCombo.getKey(&DxvkRayReconstruction::modelObject());
+        rayReconstructionPresetCombo.getKey(&DxvkRayReconstruction::presetObject());
       }
       ImGui::EndDisabled();
     }
@@ -3541,6 +3557,7 @@ namespace dxvk {
         dlssProfileCombo.getKey(&RtxOptions::qualityDLSSObject());
         rayReconstruction.showRayReconstructionImguiSettings(false);
       } else if (RtxOptions::upscalerType() == UpscalerType::DLSS) {
+        dlssRenderPresetCombo.getKey(&DxvkDLSS::presetObject());
         dlssProfileCombo.getKey(&RtxOptions::qualityDLSSObject());
         dlss.showImguiSettings();
       } else if (RtxOptions::upscalerType() == UpscalerType::NIS) {

src/dxvk/imgui/rtx_user_menu.cpp

@@ -50,6 +50,7 @@ namespace dxvk {
 
   // Combo boxes shared with dxvk_imgui.cpp
   extern RemixGui::ComboWithKey<DLSSProfile> dlssProfileCombo;
+  extern RemixGui::ComboWithKey<DxvkDLSS::DLSSPreset> dlssRenderPresetCombo;
   extern RemixGui::ComboWithKey<XeSSPreset> xessPresetCombo;
 
   // Combo boxes used only by the user menu
@@ -405,6 +406,12 @@ namespace dxvk {
 
       switch (RtxOptions::upscalerType()) {
         case UpscalerType::DLSS: {
+          // Preset is shown before the mode. Ray Reconstruction has its own preset selector
+          // (rendered by showRayReconstructionEnable above), so only show the SR preset here.
+          if (!RtxOptions::enableRayReconstruction()) {
+            dlssRenderPresetCombo.getKey(&DxvkDLSS::presetObject());
+          }
+
           dlssProfileCombo.getKey(&RtxOptions::qualityDLSSObject());
 
           // Display DLSS Upscaling Information

src/dxvk/meson.build

@@ -445,7 +445,7 @@ nrd_dep = declare_dependency(
   include_directories : nrd_include_dir
 )
 
-target_dlss_lib_path = 'lib/Windows_x86_64/x86_64'
+target_dlss_lib_path = 'lib/Windows_x86_64/x64'
 if dxvk_is_woa
   target_dlss_lib_path = 'lib/Windows_arm64/arm64'
 endif

src/dxvk/rtx_render/rtx_dlss.cpp

@@ -201,8 +201,10 @@ namespace dxvk {
     ctx->setFramePassStage(RtxFramePassStage::DLSS);
 
     bool dlssAutoExposure = useDlssAutoExposure();
-    mRecreate |= (mAutoExposure != dlssAutoExposure);
+    mRecreate |= (mAutoExposure != dlssAutoExposure)
+      || m_prevPreset != preset();
     mAutoExposure = dlssAutoExposure;
+    m_prevPreset = preset();
 
     if (mRecreate) {
       initializeDLSS(ctx);
@@ -337,6 +339,21 @@ namespace dxvk {
     // required for initializing DLSS.
     const NVSDK_NGX_PerfQuality_Value perfQuality = profileToQuality(mActualProfile);
 
-    m_dlssContext->initialize(renderContext, mInputSize, mDLSSOutputSize, mIsHDR, mInverseDepth, mAutoExposure, false, perfQuality);
+    // DLSSPreset enum values match the NGX preset enum, so a direct cast is valid.
+    // Fall back to the default preset for any unexpected/out-of-range value.
+    NVSDK_NGX_DLSS_Hint_Render_Preset dlssPreset;
+    switch (preset()) {
+    case DLSSPreset::J:
+    case DLSSPreset::K:
+    case DLSSPreset::L:
+    case DLSSPreset::M:
+      dlssPreset = static_cast<NVSDK_NGX_DLSS_Hint_Render_Preset>(preset());
+      break;
+    default:
+      dlssPreset = NVSDK_NGX_DLSS_Hint_Render_Preset_Default;
+      break;
+    }
+
+    m_dlssContext->initialize(renderContext, mInputSize, mDLSSOutputSize, mIsHDR, mInverseDepth, mAutoExposure, false, dlssPreset, perfQuality);
   }
 }

src/dxvk/rtx_render/rtx_dlss.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
+* Copyright (c) 2023-2026, NVIDIA CORPORATION. All rights reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
@@ -63,6 +63,17 @@ namespace dxvk {
       Relative,   ///< Motion vectors are provided in relative screen space length (pixels divided by screen width/height).
     };
 
+    // Note: Values must match NVSDK_NGX_DLSS_Hint_Render_Preset in nvsdk_ngx_defs.h.
+    // Presets A/B/C/D were removed in the SDK, E/F are deprecated, and G/H/I/N/O are unused,
+    // so only the valid presets are exposed here. Default lets DLSS pick the best preset per quality mode.
+    enum class DLSSPreset : uint32_t {
+      Default = 0,
+      J = 10,
+      K = 11,
+      L = 12,
+      M = 13,
+    };
+
     explicit DxvkDLSS(DxvkDevice* device);
     ~DxvkDLSS();
     static NVSDK_NGX_PerfQuality_Value profileToQuality(DLSSProfile profile);
@@ -90,6 +101,10 @@ namespace dxvk {
 
     void release();
 
+    RTX_OPTION_ARGS("rtx.dlss", DLSSPreset, preset, DLSSPreset::Default,
+                    "Render preset for DLSS Super Resolution. Default = 0 (DLSS picks the best preset), J = 10, K = 11, L = 12, M = 13.",
+                    args.flags = RtxOptionFlags::UserSetting);
+
   protected:
     virtual bool isEnabled() const override;
 
@@ -109,6 +124,7 @@ namespace dxvk {
     bool                        mInverseDepth = false;
 
     bool                        mRecreate = true;
+    DLSSPreset                  m_prevPreset = DLSSPreset::Default;
     uint32_t                    mInputSize[2] = {};            ///< Input size in pixels.
     uint32_t                    mDLSSOutputSize[2] = {};       ///< DLSS output size in pixels.
 

src/dxvk/rtx_render/rtx_ngx_wrapper.cpp

@@ -447,6 +447,7 @@ namespace dxvk
                                   bool depthInverted,
                                   bool autoExposure,
                                   bool sharpening,
+                                  NVSDK_NGX_DLSS_Hint_Render_Preset dlssPreset,
                                   NVSDK_NGX_PerfQuality_Value perfQuality) {
     ScopedCpuProfileZone();
 
@@ -475,6 +476,12 @@ namespace dxvk
 
     VkCommandBuffer vkCommandBuffer = renderContext->getCommandList()->getCmdBuffer(dxvk::DxvkCmdBuffer::ExecBuffer);
 
+    m_parameters->Set(NVSDK_NGX_Parameter_DLSS_Hint_Render_Preset_DLAA, dlssPreset);
+    m_parameters->Set(NVSDK_NGX_Parameter_DLSS_Hint_Render_Preset_Quality, dlssPreset);
+    m_parameters->Set(NVSDK_NGX_Parameter_DLSS_Hint_Render_Preset_Balanced, dlssPreset);
+    m_parameters->Set(NVSDK_NGX_Parameter_DLSS_Hint_Render_Preset_Performance, dlssPreset);
+    m_parameters->Set(NVSDK_NGX_Parameter_DLSS_Hint_Render_Preset_UltraPerformance, dlssPreset);
+
     // Release video memory when DLSS is disabled.
     m_parameters->Set(NVSDK_NGX_Parameter_FreeMemOnReleaseFeature, 1);
 

src/dxvk/rtx_render/rtx_ngx_wrapper.h

@@ -182,6 +182,7 @@ namespace dxvk {
       bool depthInverted,
       bool autoExposure,
       bool sharpening,
+      NVSDK_NGX_DLSS_Hint_Render_Preset dlssPreset,
       NVSDK_NGX_PerfQuality_Value perfQuality = NVSDK_NGX_PerfQuality_Value_MaxPerf);
 
     /** Release DLSS.

src/dxvk/rtx_render/rtx_options.cpp

@@ -539,7 +539,6 @@ namespace dxvk {
       volumetrics.setQualityLevel(RtxGlobalVolumetrics::Ultra);
       enableNrcPreset(NeuralRadianceCache::QualityPreset::Ultra);
 
-      DxvkRayReconstruction::model.setDeferred(DxvkRayReconstruction::RayReconstructionModel::Transformer);
     } else if (graphicsPreset() == GraphicsPreset::High) {
       pathMinBounces.setDeferred(0);
       pathMaxBounces.setDeferred(2);
@@ -561,7 +560,6 @@ namespace dxvk {
       volumetrics.setQualityLevel(RtxGlobalVolumetrics::High);
       enableNrcPreset(NeuralRadianceCache::QualityPreset::High);
 
-      DxvkRayReconstruction::model.setDeferred(DxvkRayReconstruction::RayReconstructionModel::Transformer);
     } else if (graphicsPreset() == GraphicsPreset::Medium) {
       lowGraphicsPresetCommonSettings();
 
@@ -570,8 +568,6 @@ namespace dxvk {
 
       volumetrics.setQualityLevel(RtxGlobalVolumetrics::Medium);
       enableNrcPreset(NeuralRadianceCache::QualityPreset::Medium);
-
-      DxvkRayReconstruction::model.setDeferred(DxvkRayReconstruction::RayReconstructionModel::CNN);
     } else if (graphicsPreset() == GraphicsPreset::Low) {
       lowGraphicsPresetCommonSettings();
 
@@ -580,8 +576,7 @@ namespace dxvk {
 
       volumetrics.setQualityLevel(RtxGlobalVolumetrics::Low);
       enableNrcPreset(NeuralRadianceCache::QualityPreset::Medium);
-
-      DxvkRayReconstruction::model.setDeferred(DxvkRayReconstruction::RayReconstructionModel::CNN);
+      
     }
 
     // Ensure we are using auto DLSS profile since we will be relying on quality downgrades for Medium/Low settings