mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 04:46:08 +00:00
fix: detect graphics capabilities and drop redundant title overrides
This commit is contained in:
1 parent
0bb8384c76
commit
64f114c96f
6 files changed
+55
-130
No files matched your search
@@ -153,41 +153,6 @@ def little_nightmares_threads(game):
|
||||
return {"PROTONFIXES_DISABLE": "1"}, [], "Little Nightmares: umu-protonfixes off (its -onethread puts the game and renderer on one thread)"
|
||||
|
||||
|
||||
@fix
|
||||
def caravan_sandwitch_feature_level(game):
|
||||
if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping":
|
||||
return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Caravan SandWitch: D3D12 feature level 12_1 (12_2 hands it mesh shader pipelines vkd3d-proton cannot build)"
|
||||
|
||||
|
||||
@fix
|
||||
def robocop_rogue_city_feature_level(game):
|
||||
if "robocop.exe" in game.files or game.stem == "robocop-win64-shipping":
|
||||
return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "RoboCop: Rogue City: D3D12 feature level 12_1"
|
||||
|
||||
|
||||
@fix
|
||||
def reskate_feature_level(game):
|
||||
if "skate.exe" in game.files and "reskate.dll" in game.files:
|
||||
return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "ReSkate (skate.): D3D12 feature level 12_1"
|
||||
|
||||
|
||||
@fix
|
||||
def stellar_blade_feature_level(game):
|
||||
if game.stem == "sb-win64-shipping" or (
|
||||
"sb.exe" in game.files
|
||||
and os.path.isfile(os.path.join(os.path.dirname(game.exe), "SB", "Binaries", "Win64", "SB-Win64-Shipping.exe"))
|
||||
):
|
||||
return {"VKD3D_FEATURE_LEVEL": None}, [], "Stellar Blade: use the driver's D3D12 feature level (12_2 advertises unsupported ray tracing)"
|
||||
|
||||
|
||||
@fix
|
||||
def cyberpunk_feature_level(game):
|
||||
if game.stem == "cyberpunk2077" or (
|
||||
game.stem == "redprelauncher"
|
||||
and os.path.isfile(os.path.join(os.path.dirname(game.exe), "bin", "x64", "Cyberpunk2077.exe"))
|
||||
):
|
||||
return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Cyberpunk 2077: D3D12 feature level 12_1"
|
||||
|
||||
def skip_red_launcher(command):
|
||||
if len(command) > 2 and os.path.basename(command[2]).lower() == "redprelauncher.exe":
|
||||
game = os.path.join(os.path.dirname(command[2]), "bin", "x64", "Cyberpunk2077.exe")
|
||||
|
||||
@@ -1170,87 +1170,33 @@ class GameEnvironmentTest(unittest.TestCase):
|
||||
self.assertEqual(speeds([0, 1], tmp), {0: 2265600, 1: 3302400})
|
||||
self.assertIsNone(speeds([0, 2], tmp))
|
||||
|
||||
def test_reskate_runs_at_feature_level_12_1(self):
|
||||
def test_titles_with_former_feature_level_workarounds_keep_detected_capabilities(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
reskate = Path(tmp) / "ReSkate"
|
||||
reskate.mkdir()
|
||||
for name in ("Skate.exe", "ReSkate.dll", "ReSkateLauncher.exe", "EAAntiCheat.GameServiceLauncher.exe"):
|
||||
(reskate / name).touch()
|
||||
for exe in ("ReSkateLauncher.exe", "Skate.exe"):
|
||||
env, extra, notes = MODULE["engine_fixes"](str(reskate / exe), [])
|
||||
self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe)
|
||||
self.assertTrue(notes)
|
||||
config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_1")
|
||||
config["games"] = {"3354750": {"VKD3D_FEATURE_LEVEL": "12_2"}}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_2")
|
||||
skate = Path(tmp) / "Skate"
|
||||
skate.mkdir()
|
||||
for name in ("Skate.exe", "EAAntiCheat.GameServiceLauncher.exe"):
|
||||
(skate / name).touch()
|
||||
self.assertEqual(MODULE["engine_fixes"](str(skate / "EAAntiCheat.GameServiceLauncher.exe"), [])[:2], ({}, []))
|
||||
|
||||
def test_stellar_blade_uses_detected_feature_level_without_overriding_game_settings(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
root = Path(tmp) / "StellarBlade"
|
||||
shipping = root / "SB/Binaries/Win64/SB-Win64-Shipping.exe"
|
||||
shipping.parent.mkdir(parents=True)
|
||||
shipping.touch()
|
||||
(root / "SB.exe").touch()
|
||||
config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}}
|
||||
for exe in (root / "SB.exe", root / ".droiddeck-launch.bat", shipping):
|
||||
env, extra, notes = MODULE["engine_fixes"](str(exe), [])
|
||||
self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": None}, []), exe)
|
||||
self.assertTrue(notes)
|
||||
inherited = {"VKD3D_FEATURE_LEVEL": "12_2", "KEEP": "unchanged"}
|
||||
effective = MODULE["apply_config"](inherited, config, "3489700", env)
|
||||
self.assertNotIn("VKD3D_FEATURE_LEVEL", effective)
|
||||
self.assertEqual(effective["KEEP"], "unchanged")
|
||||
for value in ("12_1", "12_2", None):
|
||||
explicit = dict(config, games={"3489700": {"VKD3D_FEATURE_LEVEL": value}})
|
||||
actual = MODULE["apply_config"](inherited, explicit, "3489700", env)
|
||||
self.assertEqual(actual.get("VKD3D_FEATURE_LEVEL"), value)
|
||||
other = Path(tmp) / "Other"
|
||||
other.mkdir()
|
||||
(other / "SB.exe").touch()
|
||||
self.assertEqual(MODULE["engine_fixes"](str(other / "SB.exe"), []), ({}, [], []))
|
||||
|
||||
def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
caravan = Path(tmp) / "Caravan SandWitch"
|
||||
shipping = caravan / "CaravanSandWitch/Binaries/Win64"
|
||||
shipping.mkdir(parents=True)
|
||||
for name in ("CaravanSandWitch.exe", ".droiddeck-launch.bat"):
|
||||
(caravan / name).touch()
|
||||
(shipping / "CaravanSandWitch-Win64-Shipping.exe").touch()
|
||||
cyberpunk = Path(tmp) / "Cyberpunk 2077"
|
||||
(cyberpunk / "bin/x64").mkdir(parents=True)
|
||||
for name in ("REDprelauncher.exe", "bin/x64/Cyberpunk2077.exe"):
|
||||
(cyberpunk / name).touch()
|
||||
robocop = Path(tmp) / "RoboCop Rogue City"
|
||||
(robocop / "RoboCop/Binaries/Win64").mkdir(parents=True)
|
||||
for name in ("RoboCop.exe", "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe"):
|
||||
(robocop / name).touch()
|
||||
games = [caravan / "CaravanSandWitch.exe", caravan / ".droiddeck-launch.bat",
|
||||
shipping / "CaravanSandWitch-Win64-Shipping.exe",
|
||||
robocop / "RoboCop.exe", robocop / "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe",
|
||||
cyberpunk / "REDprelauncher.exe", cyberpunk / "bin/x64/Cyberpunk2077.exe"]
|
||||
for exe in games:
|
||||
env, extra, notes = MODULE["engine_fixes"](str(exe), [])
|
||||
self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe)
|
||||
self.assertTrue(notes)
|
||||
config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_1")
|
||||
config["games"] = {"1582650": {"VKD3D_FEATURE_LEVEL": "12_2"}}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_2")
|
||||
other = Path(tmp) / "Other/Binaries/Win64"
|
||||
other.mkdir(parents=True)
|
||||
(other / "Other-Win64-Shipping.exe").touch()
|
||||
self.assertEqual(MODULE["engine_fixes"](str(other / "Other-Win64-Shipping.exe"), []), ({}, [], []))
|
||||
witcher = Path(tmp) / "The Witcher 3"
|
||||
witcher.mkdir()
|
||||
(witcher / "REDprelauncher.exe").touch()
|
||||
self.assertNotIn("VKD3D_FEATURE_LEVEL", MODULE["engine_fixes"](str(witcher / "REDprelauncher.exe"), [])[0])
|
||||
root = Path(tmp)
|
||||
names = (
|
||||
"StellarBlade/SB.exe", "StellarBlade/.droiddeck-launch.bat",
|
||||
"StellarBlade/SB/Binaries/Win64/SB-Win64-Shipping.exe",
|
||||
"Caravan/CaravanSandWitch.exe", "Caravan/.droiddeck-launch.bat",
|
||||
"Caravan/CaravanSandWitch/Binaries/Win64/CaravanSandWitch-Win64-Shipping.exe",
|
||||
"RoboCop/RoboCop.exe", "RoboCop/RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe",
|
||||
"ReSkate/Skate.exe", "ReSkate/ReSkate.dll", "ReSkate/ReSkateLauncher.exe",
|
||||
"Cyberpunk/REDprelauncher.exe", "Cyberpunk/bin/x64/Cyberpunk2077.exe",
|
||||
)
|
||||
for name in names:
|
||||
p = root / name
|
||||
p.parent.mkdir(parents=True, exist_ok=True)
|
||||
p.touch()
|
||||
for name in names:
|
||||
if name.endswith(".dll"):
|
||||
continue
|
||||
env, extra, notes = MODULE["engine_fixes"](str(root / name), [])
|
||||
self.assertNotIn("VKD3D_FEATURE_LEVEL", env, name)
|
||||
self.assertNotIn("VKD3D_SHADER_MODEL", env, name)
|
||||
for values in ({}, {"VKD3D_FEATURE_LEVEL": "12_2", "VKD3D_SHADER_MODEL": "6_9"}):
|
||||
config = {"version": 1, "shared": values}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "42", env), values, name)
|
||||
config = {"version": 1, "shared": {}, "games": {"42": values}}
|
||||
self.assertEqual(MODULE["apply_config"]({}, config, "42", env), values, name)
|
||||
|
||||
def test_unity_players_keep_tso_over_the_preset(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
|
||||
Reference in new issue
Block a user