diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index e58bf19790..042abd60bf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -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"] diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 2e4a347f33..4b1974632b 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1231,6 +1231,22 @@ class GameEnvironmentTest(unittest.TestCase): env = gpu({"TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": ""}) self.assertEqual(MODULE["apply_config"](env, config, "42")["TU_DEBUG"], "sysmem") self.assertNotIn("TU_DEBUG", MODULE["apply_config"](env, config, "43")) + def applied(config, app_id="42", env=None): + return MODULE["apply_config"](env or {"TU_DEBUG": "sysmem"}, config, app_id) + prefixed = "DROIDDECK_GAME_TU_DEBUG" + config = {"version": 1, "games": {"42": {prefixed: "gmem"}, "43": {prefixed: ""}}} + self.assertEqual(applied(config)["TU_DEBUG"], "gmem") + self.assertNotIn("TU_DEBUG", applied(config, "43")) + self.assertNotIn(prefixed, applied(config)) + shared = {"version": 1, "shared": {prefixed: "gmem"}, "games": {"42": {"TU_DEBUG": "nolrz"}, "43": {"TU_DEBUG": None}}} + self.assertEqual(applied(shared)["TU_DEBUG"], "nolrz") + self.assertNotIn("TU_DEBUG", applied(shared, "43")) + self.assertEqual(applied(shared, "44")["TU_DEBUG"], "gmem") + self.assertNotIn(prefixed, applied(shared, "44")) + both = {"version": 1, "games": {"42": {"TU_DEBUG": "sysmem", prefixed: ""}, "43": {"TU_DEBUG": None, prefixed: "gmem"}}} + self.assertEqual(applied(both)["TU_DEBUG"], "sysmem") + self.assertNotIn("TU_DEBUG", applied(both, "43", {"TU_DEBUG": "nolrz"})) + self.assertNotIn(prefixed, applied(both)) def test_games_run_with_gl_error_checks_unless_the_user_turns_them_off(self): gpu = MODULE["game_gpu"]