Merge branch 'pkristof/newPortalTest' into 'main'

[REMIX-2975] Added a new portal test See merge request lightspeedrtx/dxvk-remix-nv!893
NVIDIAGameWorks · Jul 12, 2024 · 3baca04 · 3baca04
2 parents ef7b9aa + e0695d6
commit 3baca04
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/dxvk/rtx_render/rtx_bloom.h b/src/dxvk/rtx_render/rtx_bloom.h
@@ -82,7 +82,7 @@ namespace dxvk {
     // we would like to keep the amount of steps as few as possible.
     Resources::Resource m_bloomBuffer[5] = {};
 
-    RTX_OPTION("rtx.bloom", bool, enable, true, "Enable bloom - glowing halos around intense, bright areas.");
+    RTX_OPTION_ENV("rtx.bloom", bool, enable, true, "RTX_BLOOM_ENABLE", "Enable bloom - glowing halos around intense, bright areas.");
     RTX_OPTION("rtx.bloom", float, burnIntensity, 1.0f, "Amount of bloom to add to the final image.");
     RTX_OPTION("rtx.bloom", float, luminanceThreshold, 0.25f,
                "Adjust the bloom threshold to suppress blooming of the dim areas. "

diff --git a/src/dxvk/rtx_render/rtx_options.h b/src/dxvk/rtx_render/rtx_options.h
@@ -384,7 +384,7 @@ namespace dxvk {
   public:
     const VirtualKeys& remixMenuKeyBinds() const { return m_remixMenuKeyBinds; }
 
-    RTX_OPTION("rtx", DLSSProfile, qualityDLSS, DLSSProfile::Auto, "Adjusts internal DLSS scaling factor, trades quality for performance.");
+    RTX_OPTION_ENV("rtx", DLSSProfile, qualityDLSS, DLSSProfile::Auto, "RTX_DLSS_PROFILE", "Adjusts internal DLSS scaling factor, trades quality for performance.");
     // Note: All ray tracing modes depend on the rtx.raytraceModePreset option as they may be overridden by automatic defaults for a specific vendor if the preset is set to Auto. Set
     // to Custom to ensure these settings are not overridden.
     //RenderPassVolumeIntegrateRaytraceMode renderPassVolumeIntegrateRaytraceMode = RenderPassVolumeIntegrateRaytraceMode::RayQuery;

diff --git a/src/dxvk/rtx_render/rtx_postFx.cpp b/src/dxvk/rtx_render/rtx_postFx.cpp
@@ -244,6 +244,10 @@ namespace dxvk {
     const Resources::RaytracingOutput& rtOutput,
     const bool cameraCutDetected)
   {
+    if (!enable()) {
+      return;
+    }
+
     ScopedGpuProfileZone(ctx, "PostFx");
 
     // Simulate chromatic aberration offset scale by calculating the focal length differences of 3 Fraunhofer lines,

diff --git a/src/dxvk/rtx_render/rtx_postFx.h b/src/dxvk/rtx_render/rtx_postFx.h
@@ -63,7 +63,7 @@ namespace dxvk {
     inline bool isChromaticAberrationEnabled() const { return enable() && enableChromaticAberration() && chromaticAberrationAmount() > 0.0f; }
     inline bool isVignetteEnabled() const { return enable() && enableVignette() && vignetteIntensity() > 0.0f; }
 
-    RW_RTX_OPTION("rtx.postfx", bool, enable, true, "Enables post-processing effects.");
+    RW_RTX_OPTION_ENV("rtx.postfx", bool, enable, true, "RTX_POST_FX_ENABLE", "Enables post-processing effects.");
     RW_RTX_OPTION_ENV("rtx.postfx", bool, enableMotionBlur, true, "RTX_POST_FX_MOTION_BLUR_ENABLE", "Enables motion blur post-processing effect.");
     RW_RTX_OPTION("rtx.postfx", bool, enableChromaticAberration, true, "Enables chromatic aberration post-processing effect.");
     RW_RTX_OPTION("rtx.postfx", bool, enableVignette, true, "Enables vignette post-processing effect.");