diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 6f4d21c56b..90651a3467 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -531,6 +531,31 @@ def apply_config(env, config, app_id, fixes=None): return result +def render_path_defaults(command, env): + if len(command) < 3 or command[1] != "waitforexitandrun" or Path(command[2]).name.lower() != "spintires.exe": + return None + own = env.get("DXVK_CONFIG", "") + if re.search(r"(?:^|;)\s*dxvk\.tilerMode\s*=", own) or env.get("DXVK_CONFIG_FILE"): + return None + if Path("dxvk.conf").is_file() or Path(command[2]).with_name("dxvk.conf").is_file(): + return None + driver = env.get("VK_DRIVER_FILES", env.get("VK_ICD_FILENAMES", "")) + if Path(driver).parent.name != "DD-Turnip_v0.4.0": + return None + try: + if Path("/sys/class/kgsl/kgsl-3d0/gpu_model").read_text().strip() != "Adreno722": + return None + with open(driver, encoding="utf-8") as source: + library = json.load(source)["ICD"]["library_path"] + if Path(library).name != "libvulkan_freedreno.so": + return None + except (OSError, ValueError, KeyError, TypeError): + return None + own = own.strip().rstrip(";").strip() + env["DXVK_CONFIG"] = own + "; dxvk.tilerMode = False" if own else "dxvk.tilerMode = False" + return "Spintires: DXVK tiler heuristics off on Adreno 722" + + def bridge_feature_level(env): if env.get("BL_VKBRIDGE") != "1" or env.get("VKD3D_FEATURE_LEVEL") not in ("12_1", "12_2"): return None @@ -1036,6 +1061,9 @@ def main(): env["AUDIO_DIRECT_MIC"] = "0" env = directaudio_settings(env) env = vram_cap(env) + note = render_path_defaults(command, env) if app_id else None + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) note = bridge_feature_level(env) if note: print("droiddeck-game-env: " + note, file=sys.stderr) diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 5c72ac78fa..919d6673bb 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -29,6 +29,70 @@ def config_text(entries): return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping +class RenderPathDefaultsTest(unittest.TestCase): + DRIVER = "/drivers/DD-Turnip_v0.4.0/icd.json" + COMMAND = ["proton", "waitforexitandrun", "/games/Spintires/SpinTires.exe"] + + def apply(self, env=None, command=None, model="Adreno722", library="libvulkan_freedreno.so"): + env = dict({"VK_DRIVER_FILES": self.DRIVER} if env is None else env) + manifest = json.dumps({"ICD": {"library_path": library}}) + with mock.patch.object(Path, "read_text", return_value=model), \ + mock.patch.object(Path, "is_file", return_value=False), \ + mock.patch("builtins.open", mock.mock_open(read_data=manifest)): + note = MODULE["render_path_defaults"](command or self.COMMAND, env) + return env, note + + def test_tested_render_path_keeps_other_options(self): + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG": "d3d9.maxFrameLatency = 2; ", "CUSTOM": "kept"}) + self.assertEqual(env["DXVK_CONFIG"], "d3d9.maxFrameLatency = 2; dxvk.tilerMode = False") + self.assertEqual(env["CUSTOM"], "kept") + self.assertIsNotNone(note) + self.assertEqual(self.apply()[0]["DXVK_CONFIG"], "dxvk.tilerMode = False") + self.assertIsNotNone(self.apply({"VK_ICD_FILENAMES": self.DRIVER})[1]) + + def test_other_games_devices_and_drivers_keep_their_environment(self): + for changes in ( + {"command": ["proton", "waitforexitandrun", "/games/MudRunner.exe"]}, + {"command": ["proton", "run", self.COMMAND[2]]}, + {"command": ["proton"]}, + {"model": "Adreno740"}, + {"model": "Mali-G715"}, + {"library": "libvulkan.so"}, + {"env": {}}, + {"env": {"VK_DRIVER_FILES": "/drivers/new-turnip/icd.json"}}, + {"env": {"VK_DRIVER_FILES": "", "VK_ICD_FILENAMES": self.DRIVER}}, + ): + with self.subTest(changes=changes): + env, note = self.apply(**changes) + self.assertIsNone(note) + self.assertNotIn("DXVK_CONFIG", env) + + def test_explicit_environment_and_config_files_take_precedence(self): + for value in ("dxvk.tilerMode = Auto", "d3d9.maxFrameLatency = 1; dxvk.tilerMode=True", "dxvk.tilerMode = False"): + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG": value}) + self.assertIsNone(note) + self.assertEqual(env["DXVK_CONFIG"], value) + env, note = self.apply({"VK_DRIVER_FILES": self.DRIVER, "DXVK_CONFIG_FILE": "/games/custom.conf"}) + self.assertIsNone(note) + self.assertNotIn("DXVK_CONFIG", env) + with mock.patch.object(Path, "is_file", return_value=True): + env = {"VK_DRIVER_FILES": self.DRIVER} + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, env)) + self.assertNotIn("DXVK_CONFIG", env) + + def test_unreadable_or_invalid_driver_metadata_leaves_launch_unchanged(self): + for data in ("not-json", "{}", '{"ICD":{"library_path":null}}'): + with mock.patch.object(Path, "read_text", return_value="Adreno722"), \ + mock.patch.object(Path, "is_file", return_value=False), \ + mock.patch("builtins.open", mock.mock_open(read_data=data)): + env = {"VK_DRIVER_FILES": self.DRIVER} + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, env)) + self.assertNotIn("DXVK_CONFIG", env) + with mock.patch.object(Path, "read_text", side_effect=PermissionError), \ + mock.patch.object(Path, "is_file", return_value=False): + self.assertIsNone(MODULE["render_path_defaults"](self.COMMAND, {"VK_DRIVER_FILES": self.DRIVER})) + + class DirtTelemetryFixTest(unittest.TestCase): SHOWDOWN_ON = '' SHOWDOWN_DEFAULT = ''