FSR: only set in Gamescope (remove Wine FSR)

This moves the FSR settings in Gamescope, and removes support for setting FSR in Wine. wine-ge-custom already enables FSR by default, and discourages the user from disabling it (bottlesdevs#2636). Since Gamescope is generally more independent and is a micro-compositor with first-class support with FSR, it's safer to only have an option there, and have the runner decide for the user if Gamescope isn't being used. Having two separate FSR enablers is messy, as we need logic to avoid enabling both of them at the same time, which Bottles isn't even doing. The conditions mentioned above aren't communicated at all by having FSR as a standalone setting. Fixes bottlesdevs#2755, bottlesdevs#2636
SuperSamus · Jan 1, 2025 · 9afb63f · 9afb63f
1 parent edc0018
commit 9afb63f
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 236 deletions.
diff --git a/bottles/backend/managers/manager.py b/bottles/backend/managers/manager.py
@@ -728,7 +728,6 @@ def get_programs(self, config: BottleConfig) -> List[dict]:
                     "dxvk": _program.get("dxvk"),
                     "vkd3d": _program.get("vkd3d"),
                     "dxvk_nvapi": _program.get("dxvk_nvapi"),
-                    "fsr": _program.get("fsr"),
                     "gamescope": _program.get("gamescope"),
                     "pulseaudio_latency": _program.get("pulseaudio_latency"),
                     "virtual_desktop": _program.get("virtual_desktop"),

diff --git a/bottles/backend/models/config.py b/bottles/backend/models/config.py
@@ -88,8 +88,7 @@ class BottleParams(DictCompatMixIn):
     gamescope_fullscreen: bool = True
     sync: str = "wine"
     fsr: bool = False
-    fsr_sharpening_strength: int = 2
-    fsr_quality_mode: str = "none"
+    fsr_sharpening_strength: int = 8
     custom_dpi: int = 96
     renderer: str = "gl"
     discrete_gpu: bool = False

diff --git a/bottles/backend/models/samples.py b/bottles/backend/models/samples.py
@@ -44,9 +44,6 @@ class Samples:
         "ENABLE_VKBASALT": ("vkbasalt", True),
         "WINEESYNC": ("sync", "esync"),
         "WINEFSYNC": ("sync", "fsync"),
-        "WINE_FULLSCREEN_FSR": ("fsr", True),
-        "WINE_FULLSCREEN_FSR_STRENGTH": ("fsr_sharpening_strength", 2),
-        "WINE_FULLSCREEN_FSR_MODE": ("fsr_quality_mode", "none"),
         "GAMESCOPE": ("gamescope", False),
         "DRI_PRIME": ("discrete_gpu", True),
         "__NV_PRIME_RENDER_OFFLOAD": ("discrete_gpu", True),

diff --git a/bottles/backend/wine/executor.py b/bottles/backend/wine/executor.py
@@ -38,7 +38,6 @@ def __init__(
         program_dxvk: Optional[bool] = None,
         program_vkd3d: Optional[bool] = None,
         program_nvapi: Optional[bool] = None,
-        program_fsr: Optional[bool] = None,
         program_gamescope: Optional[bool] = None,
         program_virt_desktop: Optional[bool] = None,
     ):
@@ -87,16 +86,6 @@ def __init__(
                 override_nvapi = NVAPIComponent.get_override_keys() + "=b"
                 env_dll_overrides.append(override_nvapi)
 
-        if program_fsr is not None and program_fsr != self.config.Parameters.fsr:
-            self.environment["WINE_FULLSCREEN_FSR"] = "1" if program_fsr else "0"
-            self.environment["WINE_FULLSCREEN_FSR_STRENGTH"] = str(
-                self.config.Parameters.fsr_sharpening_strength
-            )
-            if self.config.Parameters.fsr_quality_mode:
-                self.environment["WINE_FULLSCREEN_FSR_MODE"] = str(
-                    self.config.Parameters.fsr_quality_mode
-                )
-
         if (
             program_gamescope is not None
             and program_gamescope != self.config.Parameters.gamescope
@@ -127,7 +116,6 @@ def run_program(cls, config: BottleConfig, program: dict, terminal: bool = False
             program_dxvk=program.get("dxvk"),
             program_vkd3d=program.get("vkd3d"),
             program_nvapi=program.get("dxvk_nvapi"),
-            program_fsr=program.get("fsr"),
             program_gamescope=program.get("gamescope"),
             program_virt_desktop=program.get("virtual_desktop"),
         ).run()

diff --git a/bottles/backend/wine/winecommand.py b/bottles/backend/wine/winecommand.py
@@ -383,13 +383,6 @@ def get_env(
         # if params["aco_compiler"]:
         #     env.add("ACO_COMPILER", "aco")
 
-        # FSR
-        if params.fsr:
-            env.add("WINE_FULLSCREEN_FSR", "1")
-            env.add("WINE_FULLSCREEN_FSR_STRENGTH", str(params.fsr_sharpening_strength))
-            if params.fsr_quality_mode:
-                env.add("WINE_FULLSCREEN_FSR_MODE", str(params.fsr_quality_mode))
-
         # PulseAudio latency
         if params.pulseaudio_latency:
             env.add("PULSE_LATENCY_MSEC", "60")
@@ -622,10 +615,8 @@ def _get_gamescope_cmd(self, return_steam_cmd: bool = False) -> str:
                 gamescope_cmd.append("-S integer")
             if params.fsr:
                 gamescope_cmd.append("-F fsr")
-                # Upscaling sharpness is from 0 to 20. There are 5 FSR upscaling levels,
-                # so multiply by 4 to reach 20
                 gamescope_cmd.append(
-                    f"--fsr-sharpness {params.fsr_sharpening_strength * 4}"
+                    f"--fsr-sharpness {params.fsr_sharpening_strength}"
                 )
             if params.gamescope_fps > 0:
                 gamescope_cmd.append(f"-r {params.gamescope_fps}")

diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli/cli.py
@@ -673,7 +673,6 @@ def run_program(self):
             program.get("dxvk")
             program.get("vkd3d")
             program.get("dxvk_nvapi")
-            program.get("fsr")
             program.get("gamescope")
             program.get("virtual_desktop")
 

diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml
@@ -40,7 +40,6 @@
     <file preprocess="xml-stripblanks">dialog-rename.ui</file>
     <file preprocess="xml-stripblanks">dialog-gamescope.ui</file>
     <file preprocess="xml-stripblanks">dialog-vkbasalt.ui</file>
-    <file preprocess="xml-stripblanks">dialog-fsr.ui</file>
     <file preprocess="xml-stripblanks">dialog-mangohud.ui</file>
     <file preprocess="xml-stripblanks">dialog-display.ui</file>
     <file preprocess="xml-stripblanks">dialog-drives.ui</file>

diff --git a/bottles/frontend/ui/details-preferences.blp b/bottles/frontend/ui/details-preferences.blp
@@ -98,26 +98,6 @@ template $DetailsPreferences: Adw.PreferencesPage {
       }
     }
 
-    Adw.ActionRow {
-      activatable-widget: switch_fsr;
-      title: _("FidelityFX Super Resolution");
-      subtitle: _("Increase performance at the expense of visuals. Only works on Vulkan.");
-
-      Button btn_manage_fsr {
-        tooltip-text: _("Manage FidelityFX Super Resolution settings");
-        valign: center;
-        icon-name: "applications-system-symbolic";
-
-        styles [
-          "flat",
-        ]
-      }
-
-      Switch switch_fsr {
-        valign: center;
-      }
-    }
-
     Adw.ActionRow row_discrete {
       visible: false;
       activatable-widget: switch_discrete;

diff --git a/bottles/frontend/ui/dialog-fsr.blp b/bottles/frontend/ui/dialog-fsr.blp
diff --git a/bottles/frontend/ui/dialog-gamescope.blp b/bottles/frontend/ui/dialog-gamescope.blp
@@ -107,6 +107,33 @@ template $GamescopeDialog: Adw.Window {
         }
       }
 
+      Adw.PreferencesGroup {
+        title: _("FSR");
+
+        Adw.ActionRow {
+          title: _("Enable");
+          activatable-widget: switch_fsr;
+
+          Switch switch_fsr {
+            valign: center;
+          }
+        }
+
+        Adw.ActionRow {
+          title: _("Sharpening Strength");
+
+          SpinButton {
+            numeric: true;
+            valign: center;
+
+            adjustment: Adjustment spin_sharpening_strength {
+              step-increment: 4;
+              upper: 20;
+            };
+          }
+        }
+      }
+
       Adw.PreferencesGroup {
         title: _("Miscellaneous");
 

diff --git a/bottles/frontend/ui/dialog-launch-options.blp b/bottles/frontend/ui/dialog-launch-options.blp
@@ -184,15 +184,6 @@ template $LaunchOptionsDialog: Adw.Window {
           }
         }
 
-        Adw.ActionRow action_fsr {
-          activatable-widget: switch_fsr;
-          title: "FSR";
-
-          Switch switch_fsr {
-            valign: center;
-          }
-        }
-
         Adw.ActionRow action_gamescope {
           title: _("Gamescope");
           activatable-widget: switch_gamescope;

diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build
@@ -29,7 +29,6 @@ blueprints = custom_target('blueprints',
     'dialog-vkbasalt.blp',
     'dialog-display.blp',
     'dialog-vmtouch.blp',
-    'dialog-fsr.blp',
     'dialog-mangohud.blp',
     'dll-override-entry.blp',
     'drive-entry.blp',

diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py
@@ -48,7 +48,6 @@
 from bottles.frontend.windows.drives import DrivesDialog
 from bottles.frontend.windows.envvars import EnvVarsDialog
 from bottles.frontend.windows.exclusionpatterns import ExclusionPatternsDialog
-from bottles.frontend.windows.fsr import FsrDialog
 from bottles.frontend.windows.gamescope import GamescopeDialog
 from bottles.frontend.windows.mangohud import MangoHudDialog
 from bottles.frontend.windows.protonalert import ProtonAlertDialog
@@ -67,7 +66,6 @@ class PreferencesView(Adw.PreferencesPage):
     # region Widgets
     btn_manage_gamescope = Gtk.Template.Child()
     btn_manage_vkbasalt = Gtk.Template.Child()
-    btn_manage_fsr = Gtk.Template.Child()
     btn_manage_mangohud = Gtk.Template.Child()
     btn_manage_sandbox = Gtk.Template.Child()
     btn_manage_versioning_patterns = Gtk.Template.Child()
@@ -89,7 +87,6 @@ class PreferencesView(Adw.PreferencesPage):
     switch_mangohud = Gtk.Template.Child()
     switch_obsvkc = Gtk.Template.Child()
     switch_vkbasalt = Gtk.Template.Child()
-    switch_fsr = Gtk.Template.Child()
     switch_nvapi = Gtk.Template.Child()
     switch_gamemode = Gtk.Template.Child()
     switch_gamescope = Gtk.Template.Child()
@@ -227,7 +224,6 @@ def __init__(self, details, config, **kwargs):
         self.switch_mangohud.connect("state-set", self.__toggle_feature, "mangohud")
         self.switch_obsvkc.connect("state-set", self.__toggle_feature, "obsvkc")
         self.switch_vkbasalt.connect("state-set", self.__toggle_feature, "vkbasalt")
-        self.switch_fsr.connect("state-set", self.__toggle_feature, "fsr")
         self.switch_nvapi.connect("state-set", self.__toggle_nvapi)
         self.switch_gamemode.connect("state-set", self.__toggle_feature, "gamemode")
         self.switch_gamescope.connect("state-set", self.__toggle_feature, "gamescope")
@@ -407,7 +403,6 @@ def set_config(self, config: BottleConfig):
         self.switch_mangohud.handler_block_by_func(self.__toggle_feature)
         self.switch_nvapi.handler_block_by_func(self.__toggle_nvapi)
         self.switch_vkbasalt.handler_block_by_func(self.__toggle_feature)
-        self.switch_fsr.handler_block_by_func(self.__toggle_feature)
         self.switch_obsvkc.handler_block_by_func(self.__toggle_feature)
         self.switch_gamemode.handler_block_by_func(self.__toggle_feature)
         self.switch_gamescope.handler_block_by_func(self.__toggle_feature)
@@ -430,7 +425,6 @@ def set_config(self, config: BottleConfig):
         self.switch_mangohud.set_active(parameters.mangohud)
         self.switch_obsvkc.set_active(parameters.obsvkc)
         self.switch_vkbasalt.set_active(parameters.vkbasalt)
-        self.switch_fsr.set_active(parameters.fsr)
         self.switch_nvapi.set_active(parameters.dxvk_nvapi)
         self.switch_gamemode.set_active(parameters.gamemode)
         self.switch_gamescope.set_active(parameters.gamescope)
@@ -541,7 +535,6 @@ def set_config(self, config: BottleConfig):
         self.switch_mangohud.handler_unblock_by_func(self.__toggle_feature)
         self.switch_nvapi.handler_unblock_by_func(self.__toggle_nvapi)
         self.switch_vkbasalt.handler_unblock_by_func(self.__toggle_feature)
-        self.switch_fsr.handler_unblock_by_func(self.__toggle_feature)
         self.switch_obsvkc.handler_unblock_by_func(self.__toggle_feature)
         self.switch_gamemode.handler_unblock_by_func(self.__toggle_feature)
         self.switch_gamescope.handler_unblock_by_func(self.__toggle_feature)

diff --git a/bottles/frontend/windows/fsr.py b/bottles/frontend/windows/fsr.py