From 7adcb96af3cd36344b3593c6e18ac0ed75d10b06 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sun, 9 Apr 2023 12:03:27 +0200 Subject: [PATCH] FSR: only set in Gamescope (remove Wine FSR) Motivation: #2755 --- bottles/backend/models/config.py | 3 +- bottles/backend/models/samples.py | 3 - bottles/backend/wine/executor.py | 9 -- bottles/backend/wine/winecommand.py | 13 +-- bottles/frontend/cli/cli.py | 1 - bottles/frontend/ui/bottles.gresource.xml | 1 - bottles/frontend/ui/details-preferences.blp | 19 ----- bottles/frontend/ui/dialog-fsr.blp | 68 --------------- bottles/frontend/ui/dialog-gamescope.blp | 29 +++++++ bottles/frontend/ui/dialog-launch-options.blp | 9 -- bottles/frontend/ui/meson.build | 1 - bottles/frontend/views/bottle_preferences.py | 24 ------ bottles/frontend/windows/fsr.py | 85 ------------------- bottles/frontend/windows/gamescope.py | 6 ++ bottles/frontend/windows/launchoptions.py | 17 ---- bottles/frontend/windows/meson.build | 1 - 16 files changed, 38 insertions(+), 251 deletions(-) delete mode 100644 bottles/frontend/ui/dialog-fsr.blp delete mode 100644 bottles/frontend/windows/fsr.py diff --git a/bottles/backend/models/config.py b/bottles/backend/models/config.py index 695a28e6b3..8996ce475a 100644 --- 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 index 21b3a2d85b..b3616d4ce2 100644 --- a/bottles/backend/models/samples.py +++ b/bottles/backend/models/samples.py @@ -49,9 +49,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"), "DRI_PRIME": ("discrete_gpu", True), "__NV_PRIME_RENDER_OFFLOAD": ("discrete_gpu", True), "PULSE_LATENCY_MSEC": ("pulseaudio_latency", True), diff --git a/bottles/backend/wine/executor.py b/bottles/backend/wine/executor.py index 2a734eb143..56f2ad06a3 100644 --- a/bottles/backend/wine/executor.py +++ b/bottles/backend/wine/executor.py @@ -35,7 +35,6 @@ def __init__( override_dxvk: Optional[bool] = None, override_vkd3d: Optional[bool] = None, override_nvapi: Optional[bool] = None, - override_fsr: Optional[bool] = None, override_virt_desktop: Optional[bool] = None ): logging.info("Launching an executable…") @@ -77,10 +76,6 @@ def __init__( and self.config.Parameters.dxvk_nvapi: env_dll_overrides.append("nvapi,nvapi64=n") - if override_fsr is not None and override_fsr: - self.environment["WINE_FULLSCREEN_FSR"] = "1" - self.environment["WINE_FULLSCREEN_FSR_STRENGTH"] = str(self.config.Parameters.fsr_sharpening_strength) - if "WINEDLLOVERRIDES" in self.environment: self.environment["WINEDLLOVERRIDES"] += "," + ",".join(env_dll_overrides) else: @@ -94,7 +89,6 @@ def run_program(cls, config: BottleConfig, program: dict, terminal: bool = False dxvk = config.Parameters.dxvk vkd3d = config.Parameters.vkd3d nvapi = config.Parameters.dxvk_nvapi - fsr = config.Parameters.fsr virt_desktop = config.Parameters.virtual_desktop if program.get("dxvk") != dxvk: @@ -103,8 +97,6 @@ def run_program(cls, config: BottleConfig, program: dict, terminal: bool = False vkd3d = program.get("vkd3d") if program.get("dxvk_nvapi") != nvapi: nvapi = program.get("dxvk_nvapi") - if program.get("fsr") != fsr: - fsr = program.get("fsr") if program.get("virtual_desktop") != virt_desktop: virt_desktop = program.get("virtual_desktop") @@ -118,7 +110,6 @@ def run_program(cls, config: BottleConfig, program: dict, terminal: bool = False override_dxvk=dxvk, override_vkd3d=vkd3d, override_nvapi=nvapi, - override_fsr=fsr, override_virt_desktop=virt_desktop ).run() diff --git a/bottles/backend/wine/winecommand.py b/bottles/backend/wine/winecommand.py index bdad95d628..90ad400f57 100644 --- a/bottles/backend/wine/winecommand.py +++ b/bottles/backend/wine/winecommand.py @@ -340,13 +340,6 @@ def get_env(self, environment: Optional[dict] = None, return_steam_env: bool = F # 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") @@ -556,10 +549,8 @@ def _get_gamescope_cmd(self, return_steam_cmd: bool = False) -> str: if params.gamescope_scaling: gamescope_cmd.append("-n") if params.fsr: - gamescope_cmd.append("-U") - # 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}") + gamescope_cmd.append("-F fsr") + gamescope_cmd.append(f"--fsr-sharpness {params.fsr_sharpening_strength}") if params.gamescope_fps > 0: gamescope_cmd.append(f"-r {params.gamescope_fps}") if params.gamescope_fps_no_focus > 0: diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli/cli.py index 8a785946aa..16fb18fe11 100644 --- a/bottles/frontend/cli/cli.py +++ b/bottles/frontend/cli/cli.py @@ -597,7 +597,6 @@ def run_program(self): override_dxvk=_dxvk, override_vkd3d=_vkd3d, override_nvapi=_nvapi, - override_fsr=_fsr, override_virt_desktop=_virt_desktop ).run_cli() diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 7e9f59021a..097936a2b1 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -39,7 +39,6 @@ dialog-rename.ui dialog-gamescope.ui dialog-vkbasalt.ui - dialog-fsr.ui dialog-display.ui dialog-drives.ui dialog-journal.ui diff --git a/bottles/frontend/ui/details-preferences.blp b/bottles/frontend/ui/details-preferences.blp index 6800c15604..9499ae52af 100644 --- a/bottles/frontend/ui/details-preferences.blp +++ b/bottles/frontend/ui/details-preferences.blp @@ -100,25 +100,6 @@ template DetailsPreferences : .AdwPreferencesPage { } } - .AdwActionRow { - 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; - } - } - .AdwActionRow row_discrete { visible: false; activatable-widget: "switch_discrete"; diff --git a/bottles/frontend/ui/dialog-fsr.blp b/bottles/frontend/ui/dialog-fsr.blp deleted file mode 100644 index bbae03ac35..0000000000 --- a/bottles/frontend/ui/dialog-fsr.blp +++ /dev/null @@ -1,68 +0,0 @@ -using Gtk 4.0; - -template FsrDialog : .AdwWindow { - default-width: "500"; - modal: true; - - title: _("FidelityFX Super Resolution Settings"); - - ShortcutController { - Shortcut { - trigger: "Escape"; - action: "action(window.close)"; - } - } - - Box { - orientation: vertical; - - .AdwHeaderBar { - show-start-title-buttons: false; - show-end-title-buttons: false; - - Button { - label: _("_Cancel"); - use-underline: true; - action-name: "window.close"; - } - - [end] - Button btn_save { - label: _("Save"); - - styles [ - "suggested-action", - ] - } - } - - .AdwPreferencesPage { - - .AdwPreferencesGroup { - .AdwComboRow combo_quality_mode { - title: "Quality Mode"; - model: - StringList str_list_quality_mode {} - - ; - } - - .AdwActionRow { - title: _("Sharpening Strength"); - - SpinButton { - numeric: true; - valign: center; - adjustment: - Adjustment spin_sharpening_strength { - step-increment: 1; - upper: 5; - } - - ; - } - } - } - } - } -} \ No newline at end of file diff --git a/bottles/frontend/ui/dialog-gamescope.blp b/bottles/frontend/ui/dialog-gamescope.blp index 3cdd845521..94cde16c0a 100644 --- a/bottles/frontend/ui/dialog-gamescope.blp +++ b/bottles/frontend/ui/dialog-gamescope.blp @@ -114,6 +114,35 @@ template GamescopeDialog : .AdwWindow { } } + .AdwPreferencesGroup { + title: _("FSR"); + + .AdwActionRow { + title: _("Enable"); + activatable-widget: "switch_fsr"; + + Switch switch_fsr { + valign: center; + } + } + + .AdwActionRow { + title: _("Sharpening Strength"); + + SpinButton { + numeric: true; + valign: center; + adjustment: + Adjustment spin_sharpening_strength { + step-increment: 4; + upper: 20; + } + + ; + } + } + } + .AdwPreferencesGroup { title: _("Miscellaneous"); diff --git a/bottles/frontend/ui/dialog-launch-options.blp b/bottles/frontend/ui/dialog-launch-options.blp index 021e9bdab0..cc9f5b2605 100644 --- a/bottles/frontend/ui/dialog-launch-options.blp +++ b/bottles/frontend/ui/dialog-launch-options.blp @@ -152,15 +152,6 @@ template LaunchOptionsDialog : .AdwWindow { } } - .AdwActionRow action_fsr { - activatable-widget: "switch_fsr"; - title: "FSR"; - - Switch switch_fsr { - valign: center; - } - } - .AdwActionRow action_virt_desktop { title: _("Virtual Desktop"); activatable-widget: "switch_virt_desktop"; diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 0663424bd4..0f907db0c6 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -30,7 +30,6 @@ blueprints = custom_target('blueprints', 'dialog-vkbasalt.blp', 'dialog-display.blp', 'dialog-vmtouch.blp', - 'dialog-fsr.blp', 'dll-override-entry.blp', 'drive-entry.blp', 'env-var-entry.blp', diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/bottle_preferences.py index 7f5e9cb96f..8e6d09aa51 100644 --- a/bottles/frontend/views/bottle_preferences.py +++ b/bottles/frontend/views/bottle_preferences.py @@ -41,7 +41,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.protonalert import ProtonAlertDialog from bottles.frontend.windows.sandbox import SandboxDialog @@ -59,7 +58,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_sandbox = Gtk.Template.Child() btn_manage_versioning_patterns = Gtk.Template.Child() btn_manage_vmtouch = Gtk.Template.Child() @@ -81,7 +79,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() @@ -137,7 +134,6 @@ def __init__(self, details, config, **kwargs): self.row_manage_display.connect("activated", self.__show_display_settings) self.btn_manage_gamescope.connect("clicked", self.__show_gamescope_settings) self.btn_manage_vkbasalt.connect("clicked", self.__show_vkbasalt_settings) - self.btn_manage_fsr.connect("clicked", self.__show_fsr_settings) self.btn_manage_sandbox.connect("clicked", self.__show_sandbox_settings) self.btn_manage_versioning_patterns.connect("clicked", self.__show_exclusionpatterns_settings) self.btn_manage_vmtouch.connect("clicked", self.__show_vmtouch_settings) @@ -146,7 +142,6 @@ def __init__(self, details, config, **kwargs): self.switch_mangohud.connect('state-set', self.__toggle_mangohud) self.switch_obsvkc.connect('state-set', self.__toggle_obsvkc) self.switch_vkbasalt.connect('state-set', self.__toggle_vkbasalt) - self.switch_fsr.connect('state-set', self.__toggle_fsr) self.switch_nvapi.connect('state-set', self.__toggle_nvapi) # self.switch_latencyflex.connect('state-set', self.__toggle_latencyflex) self.switch_gamemode.connect('state-set', self.__toggle_gamemode) @@ -375,7 +370,6 @@ def set_config(self, config: BottleConfig): self.switch_mangohud.handler_block_by_func(self.__toggle_mangohud) self.switch_nvapi.handler_block_by_func(self.__toggle_nvapi) self.switch_vkbasalt.handler_block_by_func(self.__toggle_vkbasalt) - self.switch_fsr.handler_block_by_func(self.__toggle_fsr) self.switch_obsvkc.handler_block_by_func(self.__toggle_obsvkc) self.switch_gamemode.handler_block_by_func(self.__toggle_gamemode) self.switch_gamescope.handler_block_by_func(self.__toggle_gamescope) @@ -397,7 +391,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) @@ -500,7 +493,6 @@ def set_config(self, config: BottleConfig): self.switch_mangohud.handler_unblock_by_func(self.__toggle_mangohud) self.switch_nvapi.handler_unblock_by_func(self.__toggle_nvapi) self.switch_vkbasalt.handler_unblock_by_func(self.__toggle_vkbasalt) - self.switch_fsr.handler_unblock_by_func(self.__toggle_fsr) self.switch_obsvkc.handler_unblock_by_func(self.__toggle_obsvkc) self.switch_gamemode.handler_unblock_by_func(self.__toggle_gamemode) self.switch_gamescope.handler_unblock_by_func(self.__toggle_gamescope) @@ -536,13 +528,6 @@ def __show_vkbasalt_settings(self, widget): ) new_window.present() - def __show_fsr_settings(self, widget): - new_window = FsrDialog( - parent_window=self.window, - config=self.config - ) - new_window.present() - def __show_display_settings(self, widget): new_window = DisplayDialog( parent_window=self.window, @@ -638,15 +623,6 @@ def __toggle_vkbasalt(self, widget, state): scope="Parameters" ).data["config"] - def __toggle_fsr(self, widget, state): - """Toggle the FSR for current bottle""" - self.config = self.manager.update_config( - config=self.config, - key="fsr", - value=state, - scope="Parameters" - ).data["config"] - def __toggle_nvapi(self, widget=False, state=False): """Install/Uninstall NVAPI from the bottle""" self.queue.add_task() diff --git a/bottles/frontend/windows/fsr.py b/bottles/frontend/windows/fsr.py deleted file mode 100644 index 99838fb6b6..0000000000 --- a/bottles/frontend/windows/fsr.py +++ /dev/null @@ -1,85 +0,0 @@ -# vkbasalt.py -# -# Copyright 2022 Bottles Contributors -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from gi.repository import Gtk, GLib, Adw -from bottles.backend.logger import Logger - -logging = Logger() - - -@Gtk.Template(resource_path='/com/usebottles/bottles/dialog-fsr.ui') -class FsrDialog(Adw.Window): - __gtype_name__ = 'FsrDialog' - - # Region Widgets - btn_save = Gtk.Template.Child() - combo_quality_mode = Gtk.Template.Child() - str_list_quality_mode = Gtk.Template.Child() - spin_sharpening_strength = Gtk.Template.Child() - - def __init__(self, parent_window, config, **kwargs): - super().__init__(**kwargs) - self.set_transient_for(parent_window) - - # Common variables and references - self.window = parent_window - self.manager = parent_window.manager - self.config = config - self.quality_mode = { - "none": _("None"), - "ultra": _("Ultra Quality"), - "quality": _("Quality"), - "balanced": _("Balanced"), - "performance": _("Performance"), - } - - # Connect signals - self.btn_save.connect("clicked", self.__save) - - self.__update(config) - - def __update(self, config): - parameters = config.Parameters - - # Populate entries - for mode in self.quality_mode.values(): - self.str_list_quality_mode.append(mode) - - # Select right entry - if parameters.fsr_quality_mode: - self.combo_quality_mode.set_selected(list(self.quality_mode.keys()).index(parameters.fsr_quality_mode)) - - self.spin_sharpening_strength.set_value(parameters.fsr_sharpening_strength) - - def __idle_save(self, *_args): - print(list(self.quality_mode.keys())[self.combo_quality_mode.get_selected()]) - settings = {"fsr_quality_mode": list(self.quality_mode.keys())[self.combo_quality_mode.get_selected()], - "fsr_sharpening_strength": int(self.spin_sharpening_strength.get_value())} - - for setting in settings.keys(): - self.manager.update_config( - config=self.config, - key=setting, - value=settings[setting], - scope="Parameters" - ) - - self.destroy() - - def __save(self, *_args): - GLib.idle_add(self.__idle_save) - diff --git a/bottles/frontend/windows/gamescope.py b/bottles/frontend/windows/gamescope.py index b04203bb81..6360d61950 100644 --- a/bottles/frontend/windows/gamescope.py +++ b/bottles/frontend/windows/gamescope.py @@ -27,6 +27,8 @@ class GamescopeDialog(Adw.Window): spin_height = Gtk.Template.Child() spin_gamescope_width = Gtk.Template.Child() spin_gamescope_height = Gtk.Template.Child() + switch_fsr = Gtk.Template.Child() + spin_sharpening_strength = Gtk.Template.Child() spin_fps_limit = Gtk.Template.Child() spin_fps_limit_no_focus = Gtk.Template.Child() switch_scaling = Gtk.Template.Child() @@ -75,6 +77,8 @@ def __update(self, config): self.spin_height.set_value(parameters.gamescope_game_height) self.spin_gamescope_width.set_value(parameters.gamescope_window_width) self.spin_gamescope_height.set_value(parameters.gamescope_window_height) + self.switch_fsr.set_state(parameters.fsr) + self.spin_sharpening_strength.set_value(parameters.fsr_sharpening_strength) self.spin_fps_limit.set_value(parameters.gamescope_fps) self.spin_fps_limit_no_focus.set_value(parameters.gamescope_fps_no_focus) self.switch_scaling.set_active(parameters.gamescope_scaling) @@ -89,6 +93,8 @@ def __idle_save(self, *_args): "gamescope_game_height": self.spin_height.get_value(), "gamescope_window_width": self.spin_gamescope_width.get_value(), "gamescope_window_height": self.spin_gamescope_height.get_value(), + "fsr": self.switch_fsr.get_state(), + "fsr_sharpening_strength": int(self.spin_sharpening_strength.get_value()), "gamescope_fps": self.spin_fps_limit.get_value(), "gamescope_fps_no_focus": self.spin_fps_limit_no_focus.get_value(), "gamescope_scaling": self.switch_scaling.get_active(), diff --git a/bottles/frontend/windows/launchoptions.py b/bottles/frontend/windows/launchoptions.py index 986cac9e8d..00fb5de951 100644 --- a/bottles/frontend/windows/launchoptions.py +++ b/bottles/frontend/windows/launchoptions.py @@ -40,12 +40,10 @@ class LaunchOptionsDialog(Adw.Window): switch_dxvk = Gtk.Template.Child() switch_vkd3d = Gtk.Template.Child() switch_nvapi = Gtk.Template.Child() - switch_fsr = Gtk.Template.Child() switch_virt_desktop = Gtk.Template.Child() action_dxvk = Gtk.Template.Child() action_vkd3d = Gtk.Template.Child() action_nvapi = Gtk.Template.Child() - action_fsr = Gtk.Template.Child() action_cwd = Gtk.Template.Child() action_virt_desktop = Gtk.Template.Child() # endregion @@ -96,12 +94,6 @@ def __init__(self, parent, config, program, **kwargs): config.Parameters.dxvk_nvapi, self.action_nvapi ) - self.switch_fsr.connect( - "state-set", - self.__check_override, - config.Parameters.fsr, - self.action_fsr - ) self.switch_virt_desktop.connect( "state-set", self.__check_override, @@ -121,7 +113,6 @@ def __init__(self, parent, config, program, **kwargs): dxvk = config.Parameters.dxvk vkd3d = config.Parameters.vkd3d nvapi = config.Parameters.dxvk_nvapi - fsr = config.Parameters.fsr virt_desktop = config.Parameters.virtual_desktop if not dxvk: @@ -140,8 +131,6 @@ def __init__(self, parent, config, program, **kwargs): self.action_vkd3d.set_subtitle(self.__msg_override) if nvapi != self.program.get("dxvk_nvapi"): self.action_nvapi.set_subtitle(self.__msg_override) - if fsr != self.program.get("fsr"): - self.action_fsr.set_subtitle(self.__msg_override) if virt_desktop != self.program.get("virtual_desktop"): self.action_virt_desktop.set_subtitle(self.__msg_override) @@ -151,15 +140,12 @@ def __init__(self, parent, config, program, **kwargs): vkd3d = self.program["vkd3d"] if "dxvk_nvapi" in self.program: nvapi = self.program["dxvk_nvapi"] - if "fsr" in self.program: - fsr = self.program["fsr"] if "virtual_desktop" in self.program: virt_desktop = self.program["virtual_desktop"] self.switch_dxvk.set_active(dxvk) self.switch_vkd3d.set_active(vkd3d) self.switch_nvapi.set_active(nvapi) - self.switch_fsr.set_active(fsr) self.switch_virt_desktop.set_active(virt_desktop) def __check_override(self, widget, state, value, action): @@ -175,13 +161,11 @@ def __idle_save(self, *_args): dxvk = self.switch_dxvk.get_state() vkd3d = self.switch_vkd3d.get_state() nvapi = self.switch_nvapi.get_state() - fsr = self.switch_fsr.get_state() virt_desktop = self.switch_virt_desktop.get_state() self.program["dxvk"] = dxvk self.program["vkd3d"] = vkd3d self.program["dxvk_nvapi"] = nvapi - self.program["fsr"] = fsr self.program["virtual_desktop"] = virt_desktop self.program["arguments"] = self.entry_arguments.get_text() @@ -258,5 +242,4 @@ def __reset_defaults(self, *_args): self.switch_dxvk.set_active(self.config.Parameters.dxvk) self.switch_vkd3d.set_active(self.config.Parameters.vkd3d) self.switch_nvapi.set_active(self.config.Parameters.dxvk_nvapi) - self.switch_fsr.set_active(self.config.Parameters.fsr) self.switch_virt_desktop.set_active(self.config.Parameters.virtual_desktop) diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 818989e415..653bcc12cc 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -14,7 +14,6 @@ bottles_sources = [ 'drives.py', 'gamescope.py', 'vkbasalt.py', - 'fsr.py', 'display.py', 'generic_cli.py', 'journal.py',