diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 042abd60bf..0e816b9dab 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -86,9 +86,10 @@ def game_files(exe): class Game: - def __init__(self, exe, args): + def __init__(self, exe, args, app_id=""): self.exe = exe self.args = args + self.app_id = app_id self.stem = os.path.splitext(os.path.basename(exe))[0].lower() self.files = game_files(exe) @@ -158,6 +159,12 @@ def ff7_rebirth_feature_level(game): return {"VKD3D_FEATURE_LEVEL": "12_2"}, [], "Final Fantasy VII Rebirth: D3D12 feature level 12_2 (the device-reported level fails its DX12 check)" +@fix +def kcd2_feature_level(game): + if game.app_id == "1771300": + return {"VKD3D_FEATURE_LEVEL": "12_2", "VKD3D_SHADER_MODEL": "6_9"}, [], "Kingdom Come: Deliverance II: D3D12 feature level 12_2 and shader model 6_9 (the detected level fails its startup check, and 12_0 alone stalls on the splash screen)" + + @fix def arkham_city_x87(game): if "batmanac.exe" in game.files: @@ -367,8 +374,8 @@ def offline_without_anticheat(command, env): return command[:2] + [game] + command[3:] -def engine_fixes(exe, args): - game = Game(exe, args) +def engine_fixes(exe, args, app_id=""): + game = Game(exe, args, app_id) env, extra, notes = {}, [], [] for check in FIXES: found = check(game) @@ -1405,7 +1412,7 @@ def main(): death_stranding_allocator(app_id, command[2]) ubisoft_overlay_off(env) project_zomboid_jvm(command) - fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) + fixes, extra, notes = engine_fixes(command[2], command[3:], app_id) if len(command) > 2 else ({}, [], []) if not gl_default: fixes.pop("vblank_mode", None) for note in notes: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 4b1974632b..18435ffb9c 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1851,6 +1851,18 @@ class GameEnvironmentTest(unittest.TestCase): config = {"version": 1, "shared": {}, "games": {"42": {"VKD3D_FEATURE_LEVEL": "12_1"}}} self.assertEqual(MODULE["apply_config"]({}, config, "42", env), {"VKD3D_FEATURE_LEVEL": "12_1"}) + def test_kcd2_runs_at_feature_level_12_2_by_app_id_unless_the_game_overrides_it(self): + with tempfile.TemporaryDirectory() as tmp: + exe = Path(tmp) / "Bin/Win64MasterMasterSteamPGO/KingdomCome.exe" + exe.parent.mkdir(parents=True) + exe.touch() + env, extra, notes = MODULE["engine_fixes"](str(exe), [], "1771300") + self.assertEqual(env, {"VKD3D_FEATURE_LEVEL": "12_2", "VKD3D_SHADER_MODEL": "6_9"}) + self.assertTrue(notes) + config = {"version": 1, "shared": {}, "games": {"1771300": {"VKD3D_FEATURE_LEVEL": "12_1"}}} + self.assertEqual(MODULE["apply_config"]({}, config, "1771300", env), {"VKD3D_FEATURE_LEVEL": "12_1", "VKD3D_SHADER_MODEL": "6_9"}) + self.assertEqual(MODULE["engine_fixes"](str(exe), [], "42")[0], {}) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names):