mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-21 00:59:59 -04:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70c210cee1 | ||
|
|
043db52c62 |
@@ -1159,7 +1159,7 @@ static void held_init(void) {
|
||||
if (hold_on) hos_log("nvn: submits held (HOS_NVN_HOLD=%d: %s)", hold_on,
|
||||
hold_on == 2 ? "other threads' submits, replayed by a host thread" : "all, until a flush");
|
||||
if (hold_on == 2) {
|
||||
hold_event = CreateEventW(NULL, FALSE, FALSE, NULL);
|
||||
hold_event = CreateEventA(NULL, FALSE, FALSE, NULL); /* (A, not W: host/posix has CreateEventA only; v0.6.0's Linux builds stopped at the link) */
|
||||
HANDLE h = CreateThread(NULL, 0, hold_flush_thread, NULL, 0, NULL);
|
||||
if (h) CloseHandle(h);
|
||||
}
|
||||
|
||||
7
scripts/linux/appimage.sh
Executable file → Normal file
7
scripts/linux/appimage.sh
Executable file → Normal file
@@ -22,7 +22,12 @@ PY=$DEPS/python/bin/python3
|
||||
# ---- the Vulkan back end, built here once (it needs no game) ----
|
||||
VKW=$B/vk-work
|
||||
rm -rf "$VKW/sa/build/triforce_vk.so"
|
||||
OOT_WORK=$VKW RX_MARCH=x86-64-v3 RX_VK_ONLY=1 RX_RELEASE=1 "$PY" -I nx2/build.py --standalone --jobs "${JOBS:-$(nproc)}"
|
||||
# ((Triforce) 11-20, HOOKSHOT_FSR=1: with AMD FSR 4 (gpu/vk/vk_fsr4.cpp). A player's build reuses this back end as it is
|
||||
# (AppRun's HOOKSHOT_VK_PREBUILT), so built without it no Linux player could have FSR 4, whatever they set. With it, the
|
||||
# Upscaler row offers FSR 4 where the player's own Vulkan FSR 4 library (amd_fidelityfx_upscaler_vk.so) is in the game folder
|
||||
# or RX_VK_FSR_DIR and runs on their GPU; without the library it is not offered, as before. AMD ships no Linux library and
|
||||
# none is packed here)
|
||||
OOT_WORK=$VKW RX_MARCH=x86-64-v3 RX_VK_ONLY=1 RX_RELEASE=1 HOOKSHOT_FSR=1 "$PY" -I nx2/build.py --standalone --jobs "${JOBS:-$(nproc)}"
|
||||
VK=$VKW/sa/build/triforce_vk.so
|
||||
[ -f "$VK" ] || { echo "triforce_vk.so was not built"; exit 1; }
|
||||
|
||||
|
||||
5
scripts/linux/check_player_build.sh
Executable file → Normal file
5
scripts/linux/check_player_build.sh
Executable file → Normal file
@@ -55,6 +55,11 @@ for need in third_party/fidelityfx/api/include/ffx_api.h third_party/fidelityfx/
|
||||
[ -f "$T/$need" ] || { echo "missing: $need (gpu/vk/vk_fsr4.cpp, a build with AMD FSR 4)"; exit 1; }
|
||||
done
|
||||
echo "AMD FSR 4's headers are in it"
|
||||
# ((Triforce) 11-20) and the back end a player's build reuses (HOOKSHOT_VK_PREBUILT) has FSR 4 compiled in: it names the Linux
|
||||
# library it looks for only then (vk_fsr4.cpp kLoader; the stubs do not). Built without it, no Linux player could have FSR 4
|
||||
grep -aq "amd_fidelityfx_upscaler_vk.so" "$R/usr/lib/hookshot/hookshot_vk.so" ||
|
||||
{ echo "usr/lib/hookshot/hookshot_vk.so was built without AMD FSR 4 (scripts/linux/appimage.sh: HOOKSHOT_FSR=1)"; exit 1; }
|
||||
echo "the Vulkan back end has AMD FSR 4"
|
||||
|
||||
echo "== nx2/build.py --standalone --dry-run (as nx2/make_game.py runs it, with no game)"
|
||||
# (-B: no __pycache__ written into the image's tree. make_game.py's other settings: nx2/make_game.py, the compile's run())
|
||||
|
||||
Reference in New Issue
Block a user