Merge org main 7bc35297 into the non-Adreno test branch

Two commits since a5b035b2, no conflicts: DirectAudio low-latency fallback (#1862) and the test and
local build watermark (#1863), which CI builds without a PR number (this test APK) do not draw.
This commit is contained in:
The412Banner committed 2026-10-30 20:42:26 +00:00
commit f3ba9351e5
12 files changed
+282 -10

No files matched your search

@@ -736,6 +736,15 @@ def record_install_scripts(digest, env):
print("droiddeck-game-env: install scripts not recorded (%s)" % error, file=sys.stderr)
def directaudio_settings(env):
if "directaudio" not in env.get("WINE_AUDIO_DRIVER", "").split(","):
return env
for name, value in list(env.items()):
if name.startswith("AUDIO_DIRECT_"):
env["BANNER_" + name] = value
return env
def start(launch, launch_env, digest):
launch, launch_env = system_graphics_launch(launch, launch_env)
if digest:
@@ -911,7 +920,8 @@ def main():
command = offline_without_anticheat(command, env)
env = game_logs(command, env, app_id)
if mic_enabled == "0":
env["BANNER_AUDIO_DIRECT_MIC"] = "0"
env["AUDIO_DIRECT_MIC"] = "0"
env = directaudio_settings(env)
env = vram_cap(env)
env = force_ssbs(command, env)
game_cores(env)
@@ -338,6 +338,11 @@ bl_directaudio() {
fi
WINEDLLPATH="$da/lib/wine${WINEDLLPATH:+:$WINEDLLPATH}"
export WINEDLLPATH
for name in $(compgen -e); do
case $name in
AUDIO_DIRECT_*) export "BANNER_$name=${!name}" ;;
esac
done
WINE_AUDIO_DRIVER="directaudio,pulse"
export WINE_AUDIO_DRIVER
pfx="${STEAM_COMPAT_DATA_PATH:-}/pfx"