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:
authored and GitHub committed 2026-11-18 12:55:22 -05:00
1 parent fd2f1eec8a
commit 801da99c11
2 files changed
+28 -2

No files matched your search

+16
View File
@@ -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"]