- commit
- 26e145fcaa2af4911f0f56c62978a154a5d8907d
- parent
- dc8cb64c73564399f02080de2eb21a0b1b094002
- author
- Dami <dami.etoile@gmail.com>
| M | scripts/ | 21 | +++++++++------------ |
@@ -48,8 +48,7 @@ config_path="$config_directory/host.toml"
4848 unsafe_config_path="$unsafe_config_directory/host.toml"4949 gamescope_probe_config="$config_directory/gamescope-probe.toml"5050 fake_pw_dump="$temp_root/fake-pw-dump"51-fake_gst_inspect="$temp_root/fake-gst-inspect"52-gamescope_preflight_marker="$temp_root/gamescope-preflight-ran"51+fake_render_node="$temp_root/renderD999"5352 host_log="$temp_root/host.log"5453 second_log="$temp_root/second.log"5554 live_status="$temp_root/live-status.json"@@ -94,12 +93,6 @@ printf '%s\n' \
9493 "printf '[]\\n'" \9594 >"$fake_pw_dump"9695 chmod 0700 "$fake_pw_dump"97-printf '%s\n' \98- '#!/usr/bin/env bash' \99- "touch '$gamescope_preflight_marker'" \100- 'exit 1' \101- >"$fake_gst_inspect"102-chmod 0700 "$fake_gst_inspect"10396 false_path="/usr/bin/false"10497 [[ -x "$false_path" ]]10598 printf '%s\n' \@@ -119,9 +112,9 @@ printf '%s\n' \
119112 'xwayland_display = ":0"' \120113 "pw_dump_path = \"$fake_pw_dump\"" \121114 "gst_launch_path = \"$false_path\"" \122- "gst_inspect_path = \"$fake_gst_inspect\"" \115+ "gst_inspect_path = \"$false_path\"" \123116 'vaapi_encoder = "vah264enc"' \124- 'vaapi_render_node = "/dev/dri/renderD128"' \117+ "vaapi_render_node = \"$fake_render_node\"" \125118 'rate_control = "cqp"' \126119 'quantizer = 24' \127120 >"$gamescope_probe_config"@@ -238,7 +231,10 @@ if XDG_RUNTIME_DIR="$runtime_directory" \
238231 fi239232 grep -Fq 'another Sigil daemon or capture probe already owns this lifecycle scope' \240233 "$temp_root/contended-capture.error"241-[[ ! -e "$gamescope_preflight_marker" ]]234+if grep -Fq 'inspecting VAAPI render node' "$temp_root/contended-capture.error"; then235+ printf 'contended capture reached hardware preflight before acquiring the lifecycle lock\n' >&2236+ exit 1237+fi242238 243239 python3 - "$live_status" "$host_node_id" <<'PY'244240 import json@@ -328,7 +324,8 @@ if XDG_RUNTIME_DIR="$runtime_directory" \
328324 printf 'fake Gamescope capture unexpectedly completed\n' >&2329325 exit 1330326 fi331-[[ -e "$gamescope_preflight_marker" ]]327+grep -Fq "inspecting VAAPI render node $fake_render_node" \328+ "$temp_root/released-capture.error"332329 XDG_RUNTIME_DIR="$runtime_directory" \333330 "$sigil" serve \334331 --identity "$identity_path" \