Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configuration options for DXVK_CONFIG environment variable #519

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add configuration options for DXVK_CONFIG environment variable #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions rare/components/tabs/library/details/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from rare.components.tabs.settings.widgets.env_vars import EnvVars
from rare.components.tabs.settings.widgets.game import GameSettingsBase
from rare.components.tabs.settings.widgets.launch import LaunchSettingsBase
from rare.components.tabs.settings.widgets.overlay import DxvkSettings
from rare.components.tabs.settings.widgets.overlay import DxvkOverlaySettings, DxvkConfigSettings
from rare.components.tabs.settings.widgets.wrappers import WrapperSettings
from rare.models.game import RareGame
from rare.utils import config_helper as config
Expand Down Expand Up @@ -157,10 +157,13 @@ def load_settings(self, app_name: str):
self.app_name = app_name


class GameDxvkSettings(DxvkSettings):
class GameDxvkOverlaySettings(DxvkOverlaySettings):
def load_settings(self, app_name: str):
self.app_name = app_name

class GameDxvkConfigSettings(DxvkConfigSettings):
def load_settings(self, app_name: str):
self.app_name = app_name

class GameEnvVars(EnvVars):
def load_settings(self, app_name):
Expand All @@ -172,19 +175,30 @@ def __init__(self, parent=None):
if pf.system() != "Windows":
if pf.system() in {"Linux", "FreeBSD"}:
super(GameSettings, self).__init__(
GameLaunchSettings, GameDxvkSettings, GameEnvVars,
GameWineSettings, GameProtonSettings, GameMangoHudSettings,
GameLaunchSettings,
GameDxvkOverlaySettings,
GameDxvkConfigSettings,
GameEnvVars,
GameWineSettings,
GameProtonSettings,
GameMangoHudSettings,
parent=parent
)
else:
super(GameSettings, self).__init__(
GameLaunchSettings, GameDxvkSettings, GameEnvVars,
GameLaunchSettings,
GameDxvkOverlaySettings,
GameDxvkConfigSettings,
GameEnvVars,
GameWineSettings,
parent=parent
)
else:
super(GameSettings, self).__init__(
GameLaunchSettings, GameDxvkSettings, GameEnvVars,
GameLaunchSettings,
GameDxvkOverlaySettings,
GameDxvkConfigSettings,
GameEnvVars,
parent=parent
)

Expand All @@ -197,5 +211,6 @@ def load_settings(self, rgame: RareGame):
if pf.system() in {"Linux", "FreeBSD"}:
self.proton_tool.load_settings(rgame.app_name)
self.mangohud.load_settings(rgame.app_name)
self.dxvk.load_settings(rgame.app_name)
self.dxvk_overlay.load_settings(rgame.app_name)
self.dxvk_config.load_settings(rgame.app_name)
self.env_vars.load_settings(rgame.app_name)
21 changes: 16 additions & 5 deletions rare/components/tabs/settings/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .widgets.env_vars import EnvVars
from .widgets.game import GameSettingsBase
from .widgets.launch import LaunchSettingsBase
from .widgets.overlay import DxvkSettings
from .widgets.overlay import DxvkOverlaySettings, DxvkConfigSettings
from .widgets.wrappers import WrapperSettings

if pf.system() != "Windows":
Expand All @@ -26,18 +26,29 @@ def __init__(self, parent=None):
if pf.system() != "Windows":
if pf.system() in {"Linux", "FreeBSD"}:
super(GameSettings, self).__init__(
LaunchSettings, DxvkSettings, EnvVars,
WineSettings, ProtonSettings, MangoHudSettings,
LaunchSettings,
DxvkOverlaySettings,
DxvkConfigSettings,
EnvVars,
WineSettings,
ProtonSettings,
MangoHudSettings,
parent=parent
)
else:
super(GameSettings, self).__init__(
LaunchSettings, DxvkSettings, EnvVars,
LaunchSettings,
DxvkOverlaySettings,
DxvkConfigSettings,
EnvVars,
WineSettings,
parent=parent
)
else:
super(GameSettings, self).__init__(
LaunchSettings, DxvkSettings, EnvVars,
LaunchSettings,
DxvkOverlaySettings,
DxvkConfigSettings,
EnvVars,
parent=parent
)
1 change: 1 addition & 0 deletions rare/components/tabs/settings/widgets/env_vars_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def __init__(self, core: LegendaryCore, parent=None):

self.__readonly = {
"DXVK_HUD",
"DXVK_CONFIG",
"MANGOHUD",
"MANGOHUD_CONFIG",
}
Expand Down
15 changes: 10 additions & 5 deletions rare/components/tabs/settings/widgets/game.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from rare.widgets.side_tab import SideTabContents
from .env_vars import EnvVars
from .launch import LaunchSettingsType
from .overlay import DxvkSettings
from .overlay import DxvkOverlaySettings, DxvkConfigSettings

if pf.system() != "Windows":
from .wine import WineSettings
Expand All @@ -33,7 +33,8 @@ class GameSettingsBase(QWidget, SideTabContents):
def __init__(
self,
launch_widget: Type[LaunchSettingsType],
dxvk_widget: Type[DxvkSettings],
dxvk_hud_widget: Type[DxvkOverlaySettings],
dxvk_config_widget: Type[DxvkConfigSettings],
envvar_widget: Type[EnvVars],
wine_widget: Type['WineSettings'] = None,
proton_widget: Type['ProtonSettings'] = None,
Expand Down Expand Up @@ -81,8 +82,11 @@ def __init__(
# lambda: self.compat_stack.setCurrentIndex(self.compat_combo.currentData(Qt.ItemDataRole.UserRole))
# )

self.dxvk = dxvk_widget(self)
self.dxvk.environ_changed.connect(self.env_vars.reset_model)
self.dxvk_overlay = dxvk_hud_widget(self)
self.dxvk_overlay.environ_changed.connect(self.env_vars.reset_model)

self.dxvk_config = dxvk_config_widget(self)
self.dxvk_config.environ_changed.connect(self.env_vars.reset_model)

if pf.system() in {"Linux", "FreeBSD"}:
self.mangohud = mangohud_widget(self)
Expand All @@ -92,7 +96,8 @@ def __init__(
self.main_layout.addWidget(self.launch)
if pf.system() != "Windows":
self.main_layout.addWidget(self.compat)
self.main_layout.addWidget(self.dxvk)
self.main_layout.addWidget(self.dxvk_overlay)
self.main_layout.addWidget(self.dxvk_config)
if pf.system() in {"Linux", "FreeBSD"}:
self.main_layout.addWidget(self.mangohud)
self.main_layout.addWidget(self.env_vars)
Expand Down
Loading
Loading