mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
fix(game-env): per-game DROIDDECK_GAME_TU_DEBUG reaches the game (#2781)
* fix(game-env): per-game DROIDDECK_GAME_TU_DEBUG reaches the game game_gpu() ran on the inherited environment before apply_config() added the entries from game-environment.json, so a DROIDDECK_GAME_TU_DEBUG (or DROIDDECK_GAME_MESA_NO_ERROR) set for one game was passed through unchanged and TU_DEBUG was never set. apply_config() now returns its result through game_gpu(), so a per-game value is applied the same way as one from the session. * fix(game-env): a game's own TU_DEBUG still wins over a shared prefixed one Resolve the prefixed GPU keys inside the shared entries and inside the game's entries separately, before the game's entries are laid over the shared ones. A game's plain TU_DEBUG (or its removal with null) now beats a shared DROIDDECK_GAME_TU_DEBUG, and a prefixed value set for one game still applies. * fix(game-env): keep a plain TU_DEBUG over the prefixed key in the same profile --------- Co-authored-by: zdennisz <15849186+zdennisz@users.noreply.github.com> Co-authored-by: maxjivi05 <maxjividen@gmail.com>
This commit is contained in:
2 files changed
+28
-2
No files matched your search
@@ -453,6 +453,16 @@ def game_gpu(env, keep=False):
|
||||
return result
|
||||
|
||||
|
||||
def split_game_gpu(entries):
|
||||
result = dict(entries)
|
||||
for key in GAME_SPLIT_KEYS:
|
||||
if GAME_PREFIX + key in result:
|
||||
value = result.pop(GAME_PREFIX + key)
|
||||
if key not in entries:
|
||||
result[key] = None if value == "" else value
|
||||
return result
|
||||
|
||||
|
||||
def vram_cap(env):
|
||||
value = env.get("DD_VRAM_MB", "")
|
||||
if not re.fullmatch(r"[1-9][0-9]{0,6}", value):
|
||||
@@ -596,12 +606,12 @@ def apply_config(env, config, app_id, fixes=None):
|
||||
if config.get("version") != 1:
|
||||
raise ValueError("unsupported environment configuration")
|
||||
result = env.copy()
|
||||
entries = dict(config.get("shared", {}))
|
||||
entries = split_game_gpu(config.get("shared", {}))
|
||||
for name, value in (fixes or {}).items():
|
||||
if name == "WINEDLLOVERRIDES" and entries.get(name, env.get(name)):
|
||||
value = entries.get(name, env.get(name)) + ";" + value
|
||||
entries[name] = value
|
||||
game = config.get("games", {}).get(app_id, {})
|
||||
game = split_game_gpu(config.get("games", {}).get(app_id, {}))
|
||||
fix = (fixes or {}).get("WINEDLLOVERRIDES")
|
||||
if fix and isinstance(game.get("WINEDLLOVERRIDES"), str):
|
||||
own = game["WINEDLLOVERRIDES"]
|
||||
|
||||
Reference in new issue
Block a user