diff --git a/app/src/main/assets/recipes/default.json b/app/src/main/assets/recipes/default.json index 96e978d814..de445cf1f9 100644 --- a/app/src/main/assets/recipes/default.json +++ b/app/src/main/assets/recipes/default.json @@ -251,7 +251,8 @@ "env": { "FEX_HALFBARRIERTSOENABLED": "0", "FEX_TSOENABLED": "0", - "FEX_X87REDUCEDPRECISION": "1" + "FEX_X87REDUCEDPRECISION": "1", + "OPENSSL_ia32cap": "~0x20000000" }, "note": "community: 8 uploads, 8 sources, latest 2026-06" } @@ -2713,6 +2714,17 @@ } ] }, + "814380": { + "name": "Sekiro™: Shadows Die Twice - GOTY Edition", + "variants": [ + { + "env": { + "PROTON_NO_ESYNC": "1" + }, + "note": "community: 59 uploads, 58 sources, latest 2026-09" + } + ] + }, "8190": { "name": "Just Cause 2", "variants": [ diff --git a/app/src/main/java/com/droiddeck/launcher/session/DdProtonRecipes.kt b/app/src/main/java/com/droiddeck/launcher/session/DdProtonRecipes.kt index d5c9c239a5..af1a95396a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/DdProtonRecipes.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/DdProtonRecipes.kt @@ -30,7 +30,8 @@ object DdProtonRecipes { private const val STORE = "root/.local/share/droiddeck-recipes/store" private val ENV_PREFIXES = listOf("DXVK_", "VKD3D_", "FEX_", "MESA_", "PROTON_") - private val ENV_EXACT = setOf("mesa_glthread", "WINEDLLOVERRIDES") + private val ENV_EXACT = setOf("mesa_glthread", "WINEDLLOVERRIDES", "OPENSSL_ia32cap") + private val IA32CAP = Regex("~?0x[0-9a-fA-F]{1,16}(?::~?0x[0-9a-fA-F]{1,16})?") private val ENV_DENIED_PARTS = listOf("PATH", "_DIR", "_FILE", "LIBRARY", "ROOTFS", "THUNK", "PRELOAD") private val DLL_OVERRIDE = Regex("[A-Za-z0-9_.*-]+(?:,[A-Za-z0-9_.*-]+)*=(?:n|b|n,b|b,n|d)?") @@ -43,6 +44,7 @@ object DdProtonRecipes { if (name !in ENV_EXACT && ENV_PREFIXES.none { name.startsWith(it) }) return false if (!GameEnvironment.validValue(value)) return false if (name == "WINEDLLOVERRIDES") return value.split(';').filter { it.isNotEmpty() }.all { DLL_OVERRIDE.matches(it) } + if (name == "OPENSSL_ia32cap") return IA32CAP.matches(value) return true } diff --git a/app/src/test/java/com/droiddeck/launcher/session/DdProtonRecipesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/DdProtonRecipesTest.kt index 9c2428fbfd..ba1ed2eb2d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/DdProtonRecipesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/DdProtonRecipesTest.kt @@ -96,6 +96,8 @@ class DdProtonRecipesTest { assertFalse(value, DdProtonRecipes.envAllowed("WINEDLLOVERRIDES", value)) } assertFalse(DdProtonRecipes.envAllowed("DXVK_HUD", "a\u0000b")) + assertTrue(DdProtonRecipes.envAllowed("OPENSSL_ia32cap", "~0x20000000")) + assertFalse(DdProtonRecipes.envAllowed("OPENSSL_ia32cap", "/tmp/x")) } @Test fun thePublishedFileNamesStorePathsAndLeavesOutWhatIsMissing() { diff --git a/docs/development/dd-proton-library.md b/docs/development/dd-proton-library.md index f315f0ff9f..69bbe24159 100644 --- a/docs/development/dd-proton-library.md +++ b/docs/development/dd-proton-library.md @@ -5,7 +5,7 @@ Generated by `tools/recipes/convert.py`; do not edit by hand. See - Uploads read: 15848 in 2738 folders - Resolved to Steam apps: 1545 -- Games with a recipe: 217 +- Games with a recipe: 218 Builds treated as app defaults (ignored): A6XX dxvk: dxvk-2.3.1-async; A6XX vkd3d: vkd3d-2.12; A7XX dxvk: dxvk-2.3.1-async; A7XX vkd3d: vkd3d-2.12, vkd3d-proton-3.0.1, vkd3d-proton-3.0b; A7XX_LOW dxvk: dxvk-2.3.1-async; A7XX_LOW vkd3d: vkd3d-2.12; A8XX dxvk: dxvk-v2.6-1-async, dxvk-v2.7.1-1-async; A8XX vkd3d: vkd3d-2.12, vkd3d-proton-3.0.1, vkd3d-proton-3.0b @@ -117,6 +117,7 @@ Builds treated as app defaults (ignored): A6XX dxvk: dxvk-2.3.1-async; A6XX vkd3 | 774361 | Blasphemous | 10 | FEX_X87REDUCEDPRECISION=1 (5 of 6 sources)
FEX_MULTIBLOCK=0 (6 of 6 sources) | | 782330 | DOOM Eternal | 4 | FEX_TSOENABLED=0 (3 of 4 sources)
FEX_HALFBARRIERTSOENABLED=0 (3 of 4 sources)
FEX_X87REDUCEDPRECISION=1 (4 of 4 sources) | | 805550 | Assetto Corsa Competizione | 5 | FEX_TSOENABLED=0 (4 of 4 sources)
FEX_HALFBARRIERTSOENABLED=0 (4 of 4 sources)
FEX_X87REDUCEDPRECISION=1 (4 of 4 sources)
A8XX: VKD3D vkd3d-proton-3.0.1 from vkd3d-proton-3.0.1.tar (3 sources) | +| 814380 | Sekiro™: Shadows Die Twice - GOTY Edition | 59 | PROTON_NO_ESYNC=1 (WINEESYNC=0, 30 of 30 sources) | | 831560 | WARRIORS OROCHI 4 | 4 | FEX_TSOENABLED=0 (3 of 4 sources)
FEX_HALFBARRIERTSOENABLED=0 (3 of 4 sources)
FEX_X87REDUCEDPRECISION=1 (4 of 4 sources) | | 851850 | DRAGON BALL Z: KAKAROT | 13 | FEX_X87REDUCEDPRECISION=1 (11 of 11 sources)
A8XX: VKD3D vkd3d-proton-2.14.1 from vkd3d-proton-2.14.1 (3 sources) | | 860510 | Little Nightmares II | 17 | FEX_X87REDUCEDPRECISION=1 (8 of 9 sources) | @@ -140,7 +141,7 @@ Builds treated as app defaults (ignored): A6XX dxvk: dxvk-2.3.1-async; A6XX vkd3 | 1196590 | Resident Evil Village | 34 | A7XX: DXVK dxvk-gplasync-2.7.1-1 from dxvk-v2.7.1-1-async (4 sources) | | 1222680 | Need for Speed™ Heat | 34 | FEX_HALFBARRIERTSOENABLED=0 (20 of 20 sources)
FEX_X87REDUCEDPRECISION=1 (20 of 20 sources)
FEX_SMCCHECKS=none (17 of 20 sources) | | 1222690 | Dragon Age™ Inquisition | 6 | FEX_TSOENABLED=0 (4 of 4 sources)
FEX_HALFBARRIERTSOENABLED=0 (4 of 4 sources)
FEX_X87REDUCEDPRECISION=1 (4 of 4 sources) | -| 1228710 | MY HERO ONE'S JUSTICE 2 - Season Pass | 8 | FEX_TSOENABLED=0 (7 of 7 sources)
FEX_HALFBARRIERTSOENABLED=0 (7 of 7 sources)
FEX_X87REDUCEDPRECISION=1 (6 of 7 sources) | +| 1228710 | MY HERO ONE'S JUSTICE 2 - Season Pass | 8 | FEX_TSOENABLED=0 (7 of 7 sources)
FEX_HALFBARRIERTSOENABLED=0 (7 of 7 sources)
FEX_X87REDUCEDPRECISION=1 (6 of 7 sources)
OPENSSL_ia32cap=~0x20000000 (OPENSSL_ia32cap=~0x20000000, 4 of 4 sources) | | 1237970 | Titanfall® 2 | 8 | FEX_X87REDUCEDPRECISION=1 (7 of 7 sources) | | 1238060 | Dead Space™ 3 | 10 | FEX_HALFBARRIERTSOENABLED=0 (6 of 6 sources)
FEX_X87REDUCEDPRECISION=1 (5 of 6 sources) | | 1238810 | Battlefield™ V | 11 | FEX_X87REDUCEDPRECISION=1 (6 of 7 sources) | diff --git a/docs/development/dd-proton-testing.md b/docs/development/dd-proton-testing.md new file mode 100644 index 0000000000..e47b60c044 --- /dev/null +++ b/docs/development/dd-proton-testing.md @@ -0,0 +1,45 @@ +# DroidDeck Proton (Auto) on the Thor + +Results of running games through "DroidDeck Proton (Auto)" on the AYN Thor (Snapdragon 8 Gen 2, +Adreno 740: `A7XX`). The base is Valve's Proton Experimental ARM64 `1790245028 +experimental-11.0-20260924-arm64`. The FEX preset was the Stability-style full-TSO one. See +[game-environment.md](game-environment.md#droiddeck-proton-auto) for how recipes work and +[dd-proton-library.md](dd-proton-library.md) for the library. + +Each game was mapped to the Auto tool in Steam's Compatibility setting. FPS readings come from +`DXVK_HUD`, set through the game's own environment profile so it applies with and without a +recipe. + +## Plumbing (hand-written recipes, 2026-10-08) + +| Check | Result | +| --- | --- | +| Tool listed in Steam's per-game Compatibility; choice survives restarts | Pass | +| Bug Fables (1082710), recipe DXVK 2.6.2 + `DXVK_HUD` | Pass: HUD shows `DXVK v2.6.2`, main menu at 60 FPS, prefix `d3d11.dll` matches the package | +| Same game, recipe without packages | Pass: Valve's `DXVK v3.1.1` back in the prefix (sha256 match), 60 FPS | +| Valve's depot after both | Pass: DXVK files byte-identical to before | +| 8-Bit Bayonetta (567090), Auto tool, no recipe | Pass: stock launch, no tree built, esync on the depot | +| esync on top of a recipe tree | Pass after the fix below: exact pack match, game runs | +| Proton update | Covered by unit tests (version line changes the key); not exercised on the device | + +The first device run found that a guest `opendir()` of a directory symlink fails under proot's +fast path (`ENOTDIR`). esync's tree on top of the recipe tree then had no Wine unix libraries, and +`wineboot` died (`ws2_32.dll failed to initialize`). Recipe trees now keep esync's directories +real (`ESYNC_DIRS`). The fast path bug itself is tracked separately. + +## Community library (bundled `default.json`, 2026-10-08) + +With no override file, the app published the bundled library for `A7XX`: 209 recipes, 3 +packages fetched. Three installed games have a library entry. Each received exactly its FEX +variables, and the Auto launch path ran. + +| Game | Recipe | Result | +| --- | --- | --- | +| The Elder Scrolls V: Skyrim Special Edition (489830) | `FEX_HALFBARRIERTSOENABLED=0`, `FEX_X87REDUCEDPRECISION=1` (65 sources) | Recipe applied; Skyrim's launcher (`SkyrimSELauncher.exe`) and its first-run video detection dialog came up. Gameplay not yet checked. | +| Portal 2 (620) | `FEX_X87REDUCEDPRECISION=1` (15 sources) | Recipe applied; `portal2.exe` created its Vulkan device. Not yet checked on screen. | +| OCTOPATH TRAVELER II (1971650) | `FEX_HALFBARRIERTSOENABLED=0`, `FEX_X87REDUCEDPRECISION=1` (7 sources) | Recipe applied; the game stopped before creating a Vulkan device. Not yet compared with a stock launch, so the cause is open. | + +Still to do on the device: a stock run of each of these for comparison (same tool with an +empty override), and FPS and stability in gameplay. Record the outcome in +`tools/recipes/overrides.json`: keep the entry, replace it with a tested one, or block it. Then +regenerate the library. diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 1558b8015d..6be5ab568d 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -83,11 +83,12 @@ entries. They are limited to tuning names: the `DXVK_`, `VKD3D_`, `FEX_`, `MESA_ families, `mesa_glthread` and `WINEDLLOVERRIDES`. Names that refer to a path, directory, file, library or preload are refused. The app (`DdProtonRecipes`) and the guest both enforce this. -Recipes come from the app's `files/recipes.json` when present, otherwise from the bundled -`assets/recipes/default.json`, which is empty for now. At session start the app fetches each -named package from the Nightlies "-Linux" releases, the same way Components does. It unpacks -them into `droiddeck-recipes/store/` and publishes `~/.config/droiddeck/recipes.json` with those -paths: +Recipes come from the app's `files/recipes.json` when present (for development), otherwise +from the bundled community library, `assets/recipes/default.json`. At session start the app +picks each game's variants for the device's GPU family (`GpuInfo.Family`). It then fetches each +named package from the Nightlies "-Linux" releases, the same way Components does, unpacks them +into `droiddeck-recipes/store/` and publishes `~/.config/droiddeck/recipes.json` with those +paths. A hand-written file can use version 1, which has one recipe per game: ```json {"version": 1, "games": {"": { @@ -96,6 +97,54 @@ paths: "note": "why this game needs it"}}} ``` +The library uses version 2. Each game has a list of variants, and a variant can be limited to GPU +families. Matching variants are merged in order: the first to name a component provides it, and +later variables win. + +```json +{"version": 2, "games": {"489830": {"name": "The Elder Scrolls V: Skyrim Special Edition", + "variants": [ + {"env": {"FEX_X87REDUCEDPRECISION": "1"}, "note": "community: 66 uploads, 65 sources"}, + {"gpu": ["A6XX"], "dxvk": {"file": "dxvk-gplasync-2.7.1-1-linux.wcp", + "release": "Dxvk-gplasync-Linux"}, "env": {"DXVK_ASYNC": "1"}}]}}} +``` + +### The community library + +`tools/recipes/convert.py` builds the library from The412Banner's +[bannerhub-game-configs](https://github.com/The412Banner/bannerhub-game-configs) (GameHub and +BannerHub uploads) and [bannerlator-game-configs](https://github.com/The412Banner/bannerlator-game-configs) +(which upload folder is which Steam app). Those configs describe Android Wine containers, so +most of what they hold does not apply to Valve's ARM64 Proton under DroidDeck. The converter +keeps only what carries over, and only where independent uploads agree: + +- **FEX:** taken from arm64x containers on any GPU; arm64x is the same ARM64 Wine with FEX that + Valve's ARM64 Proton uses. Only uploads where the player chose a FEX profile or changed a + setting count; GameHub's own per-game recommendation does not. A value is kept when it differs + from FEX's default. +- **DXVK and VKD3D-Proton:** chosen per Adreno family. A build carried by at least 10% of that + family's uploads is the app default of its day, not a choice, and is ignored. The build must + exist as a Nightlies Linux package. Async forks map to gplasync with `DXVK_ASYNC=1`. +- **Other variables:** only names the recipe allowlist accepts. Turnip's `TU_DEBUG` and file + paths are dropped. + +"Agree" means at least 3 independent sources, counted as distinct upload tokens (or devices for +older uploads). At least 75% of the sources that chose something must pick the same value. For +FEX they must also cover at least half of the game's sources. Folders without a Steam app ID +(repacks, tools) are left out. Games tested by hand are recorded in `tools/recipes/overrides.json`: +kept, replaced or blocked. The converter applies that file last. + +The library and [dd-proton-library.md](dd-proton-library.md), which lists every game with its +evidence, are generated together. Refresh them with: + +```bash +git clone --depth 1 https://github.com/The412Banner/bannerhub-game-configs /tmp/bh +git clone --depth 1 https://github.com/The412Banner/bannerlator-game-configs /tmp/bl +python3 tools/recipes/convert.py --bannerhub /tmp/bh --bannerlator /tmp/bl +``` + +Results from games tested on the Thor are in [dd-proton-testing.md](dd-proton-testing.md). + ## Launch path and references WinNative's Linux session filters Android-only options, merges user variables @@ -129,6 +178,7 @@ Upstream references: [VKD3D capability parsing](https://github.com/HansKristian- Validation: `./gradlew testDebugUnitTest`, `python3 -m unittest discover -s tools/tests -p test_game_environment.py` and -`python3 -m unittest discover -s tools/tests -p test_recipe.py`. +`python3 -m unittest discover -s tools/tests -p test_recipe.py` and +`python3 -m unittest discover -s tools/tests -p test_recipe_convert.py`. Actual game compatibility depends on the installed Proton, VKD3D and Vulkan driver; these checks do not establish that every device supports feature level 12_2 or SM 6_9. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-recipe b/tools/linuxfs/overlay/usr/local/bin/droiddeck-recipe index 2411acedcf..2388adc056 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-recipe +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-recipe @@ -63,7 +63,9 @@ FEX_FILES = { # never one that names a file, a directory or a library to load: a recipe can tune a game, not run # code in it. ENV_PREFIXES = ("DXVK_", "VKD3D_", "FEX_", "MESA_", "PROTON_") -ENV_EXACT = frozenset(("mesa_glthread", "WINEDLLOVERRIDES")) +# OPENSSL_ia32cap masks CPU features OpenSSL would otherwise pick from what FEX reports. +ENV_EXACT = frozenset(("mesa_glthread", "WINEDLLOVERRIDES", "OPENSSL_ia32cap")) +IA32CAP = re.compile(r"~?0x[0-9a-fA-F]{1,16}(?::~?0x[0-9a-fA-F]{1,16})?") ENV_DENIED_PARTS = ("PATH", "_DIR", "_FILE", "LIBRARY", "ROOTFS", "THUNK", "PRELOAD") ENV_NAME = re.compile(r"[A-Za-z_][A-Za-z0-9_]*") DLL_OVERRIDE = re.compile(r"[A-Za-z0-9_.*-]+(?:,[A-Za-z0-9_.*-]+)*=(?:n|b|n,b|b,n|d)?") @@ -85,6 +87,8 @@ def env_allowed(name, value): return False if name == "WINEDLLOVERRIDES": return all(DLL_OVERRIDE.fullmatch(entry) for entry in value.split(";") if entry) + if name == "OPENSSL_ia32cap": + return bool(IA32CAP.fullmatch(value)) return True diff --git a/tools/recipes/convert.py b/tools/recipes/convert.py index 612d822b23..1989a2eb29 100755 --- a/tools/recipes/convert.py +++ b/tools/recipes/convert.py @@ -15,7 +15,8 @@ to Valve's ARM64 Proton under DroidDeck is kept, and only where independent uplo DXVK Per Adreno family. A build most uploads carry on that family is the app's default of VKD3D its day, not a choice, and is ignored. A build must exist as a Nightlies "-Linux" package (async forks map to gplasync with DXVK_ASYNC=1). - env Variables a recipe may set (droiddeck-recipe's allowlist), on agreement. + env Variables a recipe may set (droiddeck-recipe's allowlist), on agreement; Wine's own esync + and fsync switches become Proton's (WINEESYNC=0 -> PROTON_NO_ESYNC=1). "Agree" means: at least MIN_SOURCES independent uploads (distinct upload tokens, or devices for uploads without one) choose the same value, AGREEMENT of those that chose anything for it, and for @@ -62,6 +63,8 @@ FEX_FIELDS = { "MonoHacks": (True, "FEX_MONOHACKS"), } SMC_VALUES = ("none", "mtrack", "full") +# Variables GameHub's Wine reads under another name than Proton does: (name, value) -> (name, value). +ENV_TRANSLATE = {("WINEESYNC", "0"): ("PROTON_NO_ESYNC", "1"), ("WINEFSYNC", "0"): ("PROTON_NO_FSYNC", "1")} # GameHub's per-game recommendation: not the player's choice. RECOMMENDED_PROFILE = "game_recommend_id" FAMILIES = {"6": "A6XX", "8": "A8XX"} @@ -289,9 +292,12 @@ def game_variants(uploads, catalog, defaults): env_votes[name][upload.source] = value for name, votes in sorted(env_votes.items()): found = agreed(votes, len({u.source for u in uploads}), FEX_SHARE) - if found and RECIPE["env_allowed"](name, found[0]): - fex[name] = found[0] - evidence.append("%s=%s (%d of %d sources)" % (name, found[0], found[1], len(votes))) + if not found: + continue + kept, value = ENV_TRANSLATE.get((name, found[0]), (name, found[0])) + if RECIPE["env_allowed"](kept, value): + fex[kept] = value + evidence.append("%s=%s (%s=%s, %d of %d sources)" % (kept, value, name, found[0], found[1], len(votes))) if fex: variants.append({"env": fex}) for fam in ("A6XX", "A7XX_LOW", "A7XX", "A8XX"): diff --git a/tools/tests/test_recipe.py b/tools/tests/test_recipe.py index 43e282044c..0ee148c259 100644 --- a/tools/tests/test_recipe.py +++ b/tools/tests/test_recipe.py @@ -144,7 +144,7 @@ class LookupTest(RecipeTestCase): self.assertEqual(self.lookup()[0]["skipped"], ["dxvk", "fex"]) def test_environment_is_limited_to_tuning_variables(self): - allowed = {"DXVK_HUD": "version", "VKD3D_FEATURE_LEVEL": "12_1", "FEX_TSOENABLED": "1", "MESA_SHADER_CACHE_MAX_SIZE": "1G", + allowed = {"OPENSSL_ia32cap": "~0x20000000:~0x0", "DXVK_HUD": "version", "VKD3D_FEATURE_LEVEL": "12_1", "FEX_TSOENABLED": "1", "MESA_SHADER_CACHE_MAX_SIZE": "1G", "PROTON_USE_WINED3D": "1", "mesa_glthread": "true", "WINEDLLOVERRIDES": "xinput1_3=n,b;d3dx9_43=n;libsentry=d;dinput8="} denied = {"LD_PRELOAD": "/x.so", "WINEDLLPATH": "/x", "PROTON_LOG_DIR": "/x", "DXVK_CONFIG_FILE": "/x", "VKD3D_SHADER_CACHE_PATH": "/x", "MESA_SHADER_CACHE_DIR": "/x", "FEX_ROOTFS": "/x", "FEX_THUNKHOSTLIBS": "/x", @@ -154,6 +154,7 @@ class LookupTest(RecipeTestCase): self.assertEqual(found["env"], allowed) for name in denied: self.assertIn(name, said) + self.assertFalse(RECIPE["env_allowed"]("OPENSSL_ia32cap", "/tmp/x")) for value in ("../evil.dll=n", "a=n;b=x", "a=native", "a"): self.assertFalse(RECIPE["env_allowed"]("WINEDLLOVERRIDES", value), value) self.assertFalse(RECIPE["env_allowed"]("DXVK_HUD", "x" * 8193)) diff --git a/tools/tests/test_recipe_convert.py b/tools/tests/test_recipe_convert.py index 3019ec06d8..1caf6362f7 100644 --- a/tools/tests/test_recipe_convert.py +++ b/tools/tests/test_recipe_convert.py @@ -143,6 +143,12 @@ class ConvertTest(unittest.TestCase): env='TU_DEBUG="noconform" WINEDLLOVERRIDES=xinput1_3=n,b DXVK_CONFIG_FILE=/sdcard/x.conf') self.assertEqual(self.build()[0]["games"]["42"]["variants"][0]["env"], {"WINEDLLOVERRIDES": "xinput1_3=n,b"}) + def test_wine_switches_become_protons_and_openssl_masks_are_kept(self): + for token in "abc": + self.upload("Game", "42", token, fex=RECOMMENDED, env="WINEESYNC=0 OPENSSL_ia32cap=~0x20000000 WINEMU_CPU_AFFINITY=127") + self.assertEqual(self.build()[0]["games"]["42"]["variants"][0]["env"], + {"PROTON_NO_ESYNC": "1", "OPENSSL_ia32cap": "~0x20000000"}) + def test_uploads_without_an_appid_are_left_out(self): for token in "abc": self.upload("Repack", None, token)