feat(telemetry): crash reports from the game's own window, and performance statistics #983
No reviewers
Labels
No labels
area/accessibility
area/audio
area/input
area/install
area/menu
area/renderer
area/saves
area/tooling
area/upscaling
beanstalk: approved
beanstalk: failed
beanstalk: needs approval
beanstalk: running
beanstalk: tested
ci: approved
good first issue
gpu/amd
gpu/igpu
gpu/intel
gpu/nvidia
help wanted
kind
bug
kind
chore
kind
docs
kind
feature
kind
performance
kind
question
needs measurements
platform/linux
platform/macos
platform/steam-deck
platform/windows
preview
priority
critical
priority
high
priority
low
regression
risk
high
risk
low
risk
medium
status
blocked
status
confirmed
status
duplicate
status
invalid
status
needs-info
status
wontfix
ci: approved
No milestone
No project
No assignees
3 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Longshot!983
Loading…
Reference in a new issue
No description provided.
Delete branch "gab9281/Longshot:feat/telemetry"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Type: feat · Risk: medium · Tested on: Linux (CachyOS, KDE Wayland), RTX 3060 Laptop and Radeon 680M · Needs: Windows, any GPU
Why
When the game crashes or runs badly, the team only hears about it if a player finds the log and files an issue by hand, and most don't. This lets a player send a crash report from the game's own crash window with one click, and opt in to performance statistics so the team can see where Longshot stutters, on which hardware. Nothing is sent without the player's click or tick. See #44 (local problem reports, which this sends on from) and #1058 (the SDL message box's cut-off button: that box is now only the fallback, so the cut can still appear there).
What changed
The crash window is now the game's own: it shows the report and sends it itself, so any build can send one, not only a launcher-made one. The game also counts its frames for the opt-in performance summary, which
nx2/perf_report.pysends. Both go to Longshot-api atdata-services.magicbean.dev. The launcher's side (MagicBeanDev/LongshotLauncher#128) is the statistics tick, the Send crash reports automatically tick, and build reports.gpu/vk/vk_crash_window.cpp,vk_ui.h): one window after a crash, with Report automatically and Report manually, which survives an out-of-memory end. It is drawn as the Insert menu (F1) is: the banner, the Libertinus fonts, the gold buttons. Dear ImGui lays it out, and SDL's software renderer draws it through the SDL the crash helper already loads (SDL3 or SDL2), so it never touches Vulkan or the GPU's driver, where the crash may have been. On Wayland it asks SDL for X11 (XWayland), since SDL's Wayland driver has no software framebuffer. SDL's message box is the fallback.host/hos_crash_dialog.c): built in C from the run's log: the crash's lines without the game's memory rows, the 150 lines before it and every setting, with the home folder, user name and device names taken out. It is posted to/telemetry/crashwith the system'scurl, only on Send: https only, to the addressmake_game.pystamps fromnx2/addresses.ini(crash_reports=,crash_issue=), with no redirect followed.nx2/crash_report.pyand the launcher's--crash-*commands are gone. The report also carries the renderer and the run's settings (#729), and main'scpu_name()goes undercpu_text().5398732c): when the launcher's tick has writtenlongshot_crash.ini(send=1) in the game folder, the crash helper posts the report that Report automatically would post, with no window (send_quietly,hos_crash_auto_send). The answer goes to the log, and the report isn't sent again. If it can't be sent (the server is busy or not reached, or the report is refused), the window shows as it does today. Without the file, the window asks first.gpu/vk/perf_report.cpp,fps_stats.h,vk_fps.h,nx2/perf_report.py): the game counts frame and GPU times, hitches by cause, pacing, renderer events, movies and memory per map. Every 5 minutes and at exit it writes a summary toperf_pending/, andnx2/perf_report.pysends them at the next start with backoff, switches and optional copies. The host givesperf_infoto the renderer:MKWVK_API_VERSION25, after main's playback callbacks (24).nx2/addresses.ini, docs): Longshot-api asdata-services.magicbean.dev.docs/performance-statistics.md, and the new switches indocs/development.md.docs/images/guide/): this PR touches ten of the Graphics illustration's reviewed menu sources. Rendered from this branch and from main02903b04, the fixture differs only in its version caption, so the PNG stays and the reviewed hashes advance (source-review-telemetry.md). Main's own Quality preset help text has drifted since the capture; the review notes it for a recapture.What is sent
Both go to
https://data-services.magicbean.devwith no account, ID or path. Longshot-api refuses a payload that doesn't fit (400, with the reason) and caps each field as the tables say.POST /telemetry/crashPOST /telemetry/perfCrash report (
/telemetry/crash, at most 128 KiB)crashversioncpugpulog_tailmapoptionsosreleaserendererExample:
Performance summary (
/telemetry/perf)vversioncpudriverfirstfps_capgpukernelmapmapsmemoryospresetram_gbreleaserenderersession_supscalervram_gbPer map (
MapSummary)draws_left_outeventsdevice_lost,dlss_recreated,movie_upscaler_dropped,program_failed,swapchain_recreated,vram_over_budgetframe_msframe_ms_sumgpu_msgpu_ms_sumhitchesgame_cpu,gpu_bound,memsync,other,pace,pipeline_wait,readback,shader_translate,texture_uploadmoviedecode_ms,dropped,fallbacks,late,shownnewpacing_missesparts_msgame,gpu_wait,pace,rendersecondsExample:
The crash window
Drawn offscreen with this branch's code (the same through SDL3 and SDL2):
Measurements
Verdict: No cost found. With the statistics off or on, the start's frame rate stays within main's own spread: 127.0 fps on main, 124.4 off and 122.9 on, while each side's three runs spread wider than those differences.
add_frame()costs 16 ns a frame.Hardware: Linux (CachyOS, kernel 7.3.4), KDE Wayland, RTX 3060 Laptop 6 GB (NVIDIA 620.70.06), Ryzen 7 6800H, 15 GB
Scene: the start (intro and title), 2048x1152, preset Auto (DLSS), no frame generation, uncapped (
HOS_FPS_MAX=1000),HOS_AUDIO=0Method: frames from 20 s on in a 75 s run (
RX_VK_FRAME_LOG), 3 runs a side interleaved with main first each round, the median. The PC was busy and swapping, so every side got slower each roundHow to reproduce: the same settings and switches with
RX_VK_FRAME_LOGset, andlongshot_perf.iniholdingsend=1(on) or nothing (off); the runs aredocs/tested/2026-11-15-perf-stats-gab9281-main-e090.md,-off-e090.mdand-on-e090.mdBaseline: this PR's statistics were measured as
9981a39a, on maine090cc48. The branch has been rebased onto main02903b04since then, and the frame path did not change in the rebase.e090cc489981a39a9981a39aFlags and settings
New switches for testing, all off or at a polite default, and the player's statistics tick, which is off by default.
longshot_crash.inisend=1tests/test_crash_dialog.py(posted with no window; a busy server brings the window back)longshot_perf.inisend=1longshot_perf.inikeep_sent=0perf_sent/, and those kept are deletedtests/test_perf_report.pyRX_VK_PERF_INTERVALtests/test_perf_report.py; no cost to measureLONGSHOT_PERF_URLperf_reportsinnx2/addresses.iniLONGSHOT_PERF_MAX_SENDS,LONGSHOT_PERF_TIMEOUT,LONGSHOT_PERF_BACKOFF,LONGSHOT_PERF_KEEP_SENTtests/test_perf_report.pyHOS_CRASH_TESTstart, or after some seconds)nx2/addresses.inicrash_reports,crash_issue,perf_reportsdata-services.magicbean.dev, issue 81Testing
Tested:
HOS_CRASH_TEST) opened the themed window through XWayland. Report automatically reached Longshot-api and posted its comment on #81, and the crash was counted in Prometheus./telemetry/perf, counted in Prometheus), and the measurements above.tests/test_crash_dialog.py: 19 passed. This includes a run of the helper after a crash with a stand-in for curl: the report posted to the stamp's address, its fields, Show all of it, Send, Open it, offered once, a busy server with Try again, a refusal without it, and no Send without the addresses. Withlongshot_crash.inisend=1, the report is posted with no window, and a busy server brings the window back with Report automatically still offered.02903b04:test_fps_stats,test_fps_rate,test_high_fps_fixes,test_perf_report,test_fps_overlay_order,test_crash_dialog,test_crash_record,test_quit_not_crash,test_audio_output_devices,test_doc_anchors,test_menu_env_overrides,test_switches_removedandtest_guide_screenshots: passed.python -I -B tests/run_all.py(Linux, 6 at once): 577 passed, 70 failed, 17 skipped. The 70 failures fail the same on main on this PC. The environment has nospirv-val, no sibling Tooling checkout, and the toolchain's packages aren't in the system paths (test_linux_preflight,test_nup_cacheandtest_packaged_folder, among others).Not tested: Windows. I have no Windows PC or toolchain here, so the crash window through SDL on Windows, the Win32 paths and the
curlthat ships with Windows are untested, and I couldn't compile it for Windows either (no llvm-mingw here, and this PR's CI has no Windows build). The Steam Deck is untested too.Must be tested:
HOS_CRASH_TEST=start, expecting the themed crash window (not the message box) with Report automatically, and a report that reaches #81 when pressed (Test Farm: @Beanstalk windows, HOS_CRASH_TEST=start, press Report automatically)perf_sent/to hold the sent summary (Test Farm: @Beanstalk windows, performance statistics on, 6 minutes of play, then start again)Risks
What could break: the crash window on Windows, or on a display without X11, where it falls back to SDL's message box. A failed send leaves the report on the clipboard and in the log folder. The statistics' sender runs at start in a process of its own, with a 10 s limit on each request.
Turning it off:
HOS_CRASH_WATCH=0turns the crash helper off. The statistics and the automatic crash reports are off unless the player ticks them. Otherwise, revert the PR.Compatibility:
MKWVK_API_VERSIONgoes to 25 (perf_info), so the renderer packs and the host must come from the same build, as every API bump requires. Saves,longshot_options.iniand the shader caches don't change. Launchers from before LongshotLauncher#128 still build this version; they just offer no statistics tick, and their--crash-*commands are no longer called.Issues
See #44
See #1058
Checklist
Everyone
type(scope): description) of the status line's type.main.python -I -B tests/run_all.pypasses (any failure that also fails onmainis named).third_party/untouched (a new folder with aPROVENANCE.mdinstead).When it applies
Assisted-by:/Co-Authored-By:trailers.docs/tested/for each new measured run (format indocs/tested-configurations.md).MKWVK_API_VERSIONbumped (gpu/vk/vk_api.h'sMkwVkHostorMkwVkRendererchanged).tests/that reads changed source updated in this PR, not weakened.🤖 Generated with Claude Code
https://claude.ai/code/session_015KgSKmKkUWA2ugWzrw7GN4
fbd42024cbfa5ad9cb6c9edffein tested configurations 316ece28fce090cc4857d6ca5987Possibly related, for context:
7745956aa631e529b70a4fbf1285edaa40715893feat(telemetry): crash reports and performance statistics, to data-services.magicbean.devto feat(telemetry): crash reports from the game's own window, and performance statisticsFound building this branch and crashing it on purpose on KDE Plasma (Wayland): SDL3's Wayland driver has no window framebuffer of its own, so with SDL_FRAMEBUFFER_ACCELERATION=0 the software renderer can't be made ("Window framebuffer support not available") and the helper fell back to SDL's message box. X11's driver has one: the window asks for X11 where DISPLAY is set, Wayland when X11 can't be had, and SDL_VIDEO_DRIVER in the environment still chooses. Co-Authored-By: Claude Opus 5.5 <[email protected]>feebf14afd43779925d443779925d4e0b038be6eReview: request changes
What this does for a player: after a crash, the game's own themed window can send a crash report to the team in two clicks, or with no window at all when the launcher's "Send crash reports automatically" box is ticked. The game can also count frame times, hitches and movie playback per map for the launcher's opt-in "Send performance statistics". I read the whole diff (code only, nothing run). The design holds up. Every network path is opt-in. The perf side stays off and writes nothing without
send=1, and the tick off deletes what is waiting. The crash post is https only, posts to the stamp's address only, and the Sent link can only go to issue 81. The blocking points below are mostly small.Blocking
The PR conflicts with main, and the API version it takes is gone. Main took
MKWVK_API_VERSION25 formic_test(#1102). After the rebase,perf_infomust come aftermic_testas version 26. Six files conflict:gpu/vk/vk_api.h,host/rx_backend.c,gpu/vk/vk_dlss.cpp(two hunks, an include and a log line),tests/test_audio_output_devices.py(three hunks),docs/images/guide/README.mdanddocs/images/guide/manifest.json(four hunks). The text conflicts are easy, but two need decisions. The version number has to change. The guide manifest's reviewed-source hashes have to be worked out again against main's new Graphics capture (main recaptured it for the microphone test). In the same rebase, keep main's exact checks intests/test_audio_output_devices.py. This branch loosened them from== 24to>= 24, and fromfields[-6:]to an index search. The right fix is== 26, withperf_infoasserted as the last field aftermic_test. AGENTS.md asks for the check to be updated, not weakened.hos_crash_cleancan loop forever and write past its buffer (host/hos_crash_dialog.h:940). The device loop callsstrstr(s, devices[d])from the start of the string each time. If the microphone's name (frommicrophone_device=) is a substring of<device>, the loop never ends, and each pass grows the string by8 - dnbytes. Examples of such names aredev,viceanddevice. Even with a normal short name (3 to 7 bytes), every replacement grows the string in place with no check againstcap.build_reportbreaks the "at least 3x its text" rule: it copies a crash line of up to 4095 bytes intoline[1208], which leaves it full (host/hos_crash_dialog.c:1307).hos_crash_devices_out'smemmove(name + 8, ...)grows the string the same way. This runs after every crash, in the process that has to survive. The fix: search on from after each replacement, and write into a separate output bounded bycap, ashos_crash_redact_linealready does.Stray keys can send a report. Consent is meant to be a click. In the crash window (
gpu/vk/vk_crash_window.cpp:408), the first button is selected and Enter or Space presses it. The first button is Report automatically on the first page, and Send on the next (host/hos_crash_dialog.c:1404). Key-repeat events are not filtered, and the window raises itself. A player holding or mashing Space or Enter when the game dies can therefore send the report with two presses, without reading the page. The fix:curl reads the player's
.curlrc/_curlrc. The description promises "https only, no redirect followed". Alocation,proxy,insecureoroutputline in the player's curl config changes that, and the source-text test ("--location" not in post_fn) can't see it. Make--disable(-q) the first argument (host/hos_crash_dialog.c:1348).The automatic send leaves no trace of what it sent.
send_quietlywrites its answer withfprintf(stderr, ...)(host/hos_crash_dialog.c:1383), but the helper's stderr is/dev/nullon Linux and nothing on Windows (spawn_exe). The docs' claim that it "notes the answer in the log" ([hos crash] sent on its own) is therefore not true. The payload file is also deleted afterwards. A player who chose sending with no window can't see what went.bug-reports/sent/<record>holds only the status and the link. Keep a copy of the payload there (asperf_sent/does for summaries), and write the line somewhere that persists.Suggestions
spawn_exepassesenvironunchanged,LD_LIBRARY_PATHandLD_PRELOADincluded. That means overlays (MangoHud, Steam's overlay) and any library folder the game was given.own_scopealready strips both forbusctl; do the same for curl, or the system curl can load the wrong libssl.spawn_exereturns 2 and leaves it running. The page then says "Nothing was sent", which may be false. Kill it, or say "may not have been sent". The window is also not redrawn while curl runs, for up to 30 s. Windows marks a window that stops pumping messages as "Not responding" after about 5 s. A "Sending…" page, or pumping events while waiting, would avoid that.Z:\home,C:\Users,/var/homeand audio devices are handled. Some things are not:D:\Games\…,/mnt/<name>-nas/…or\\NAS-NAME\share\…, which also gives away the share's host name. Replacing the game folder itself (s->dir) with<game folder>before the shape rules would catch the most common case.hid: controller "<name>"lines can carry a Bluetooth alias.maxorretwill also replace those words inCRASH:lines, and those lines feed the relay's crash signature. Matching case-sensitively incrashlines would avoid that.perf_report.pythen counts it as refused and deletes it. Write the summary early whenmapsreaches 16 (gpu/vk/perf_report.cpp:151).longshot_vk.dllafter a crash, which runs its imports and static initializers, possibly near out of memory. The Windows run should also try a game folder with non-ASCII characters in its path: System32'scurl.exehas to open--data-binary @<path>.The description
own_scope()callingbusctl … StartTransientUnitat every Linux start to leave the game's systemd scope, SIGTERM held back in the helper, andoom_kill: yesrecords shown at the next start. It came over from #141 and is documented indocs/crash-report-window.md. It is a new process spawned on every start, so it belongs in Why and What changed, and in Risks.make_game.pywritescrash_reports=only for packaged tools (if tag:), so a build from a checkout has no Report automatically. The README says "In a build the Longshot Launcher made", so make the description and the README agree.HOS_CRASH_TESTis on main already, so its "Before this PR: not there" row is wrong.nx2/crash_report.pyand the launcher's--crash-*commands are gone": neither was ever on main. They came from this branch's earlier commits and from #141. Say "replaces #141's launcher window".The launcher contract (from this side), with MagicBeanDev/LongshotLauncher#128
longshot_crash.ini. The launcher writes# …\nsend=1\n(orsend=0) with\nline endings, before Play, and only when the value changed.hos_crash_auto_sendskips the comment, allows blanks and a CR, and takes onlysend=1. That matches. The game only reads the file and never writes it.longshot_perf.ini. It is written only throughnx2/perf_report.py --tick on|off [--keep-sent off], which the launcher calls with exactly that syntax and waits up to 5 s for.--tick offdeletes the file,perf_pending/andperf_sent/. The game readssend=(atoi == 1) at its first present and again before each summary, so unticking during play stops it.--sendruns in its own detached process and sends nothing unlesssend=1. That matches.--crash-*commands. Nothing on either side still calls--crash-window,--crash-preview,--crash-send,sender=orLONGSHOT_CRASH_SENDER.Overlapping PRs
This PR supersedes both:
Both are by the same author, and both should be closed once this is the path taken. (Their launcher halves, MagicBeanDev/LongshotLauncher#74 and MagicBeanDev/LongshotLauncher#46, look superseded by MagicBeanDev/LongshotLauncher#128 as well.)
Testing
tests/test_crash_dialog.pyuses a stand-in curl andtests/test_perf_report.pya relay on 127.0.0.1. Neither test reaches the network.perf_sent/after the next start). No tester has posted a run on the PR. This can't be approved until those runs are posted and the rebase is done.@ -0,0 +148,4 @@const std::string name = map[0] ? map : shaders_preparing() ? pr::kPreparingShaders : pr::kTitleAndIntro;if (!current || name != current_map) {current_map = name;current = &maps[name];The relay takes at most 16 keys in
maps, but nothing here caps them. A 17th map within one period gets a 400, andperf_report.pythen counts the summary as refused and deletes it. Callsummarize(false)early whenmaps.size()reaches 16.@ -249,0 +251,4 @@"" before a save is loaded) into map, and the movies' totals so far (host/nn_video.c): [0] pictures shown, [1] skipped tokeep up with the sound, [2] shown late (over 50 ms after the one before), [3] decoding time in ns, [4] decoders that didnot start (another one took over). Returns the build's version (LONGSHOT_VERSION) */const char *(*perf_info)(char *map, int cap, int64_t movie[5]);Main now uses version 25 for
mic_test(#1102). After the rebase,perf_infogoes aftermic_test, andMKWVK_API_VERSIONgoes to 26.@ -0,0 +405,4 @@if (in.scancode == 43) sel = (sel + (in.shift ? n - 1 : 1)) % n; // (Tab, Shift+Tab)if (in.scancode == 79 || in.scancode == 81) sel = std::min(n - 1, sel + 1); // (right, down)if (in.scancode == 80 || in.scancode == 82) sel = std::max(0, sel - 1); // (left, up)if (in.scancode == 40 || in.scancode == 88 || in.scancode == 44) result = sel; // (Enter, the keypad's, Space)Key-repeat events aren't filtered, and a key already held when the page appears counts. A player holding or mashing Space or Enter as the game crashes presses the selected button, and the window raises itself to the front. Drop repeats (SDL3's
repeatbyte in the keyboard event, SDL2's at offset 13). Take a key only once its key-up has been seen on this page, or after a short delay.@ -952,0 +1401,4 @@free(json.s), free(shown.s);return 0;}const char *const ask[] = {"Send", "Show all of it", "Cancel"};Send is the first button, so it is selected and Enter or Space presses it. Together with Report automatically being first on the page before, two stray presses carried over from play send the report. Make Cancel (or Show all of it) the default here.
@ -1017,0 +1518,4 @@game was in (DefaultOOMPolicy=stop) and everything in it, which must not be this helper. Where it can't (no systemd, orin a Flatpak, which keeps the sandbox's processes in its scope), it stays; an out-of-memory end is then shown at thenext start (hos_crash_show_at_start). At most 2 s, its output nowhere, without the game's library paths */static void own_scope(void) {The PR description doesn't mention this: a
busctl --user ... StartTransientUnitat every Linux start (a->mode == 1), plus SIGTERM held in the helper. It came over from #141. Please add it to What changed and Risks, because it is a new process on every start.@ -952,0 +1304,4 @@version, in.release ? "Yes" : "No (a local or modified build)", os, f->renderer[0] ? f->renderer : "not known",f->gpu[0] ? f->gpu : "not known", f->cpu[0] ? f->cpu : "not known", place, in.settings, in.changed);for (int i = 0; i < crash.n && i < 12; i++) {char line[HOS_CRASH_LINE_LIMIT * 4 + 8];crash.at[i]can be up to 4095 bytes (one[4096]incrash_lines), so this copy fillslineto its end. That breakshos_crash_clean's rule that the buffer is at least 3x its text, and the device replacement then writes past it. Size it from the text (strlen * 3 + 64, asput_fielddoes), or cut the line toHOS_CRASH_LINE_LIMITfirst.@ -952,0 +1345,4 @@remove_utf8(headers), remove_utf8(answer);snprintf(data, sizeof data, "@%s", payload);/* (no redirect followed: the report goes to the address in the stamp and nowhere else; at most 30 s) */const char *const args[] = {"--silent", "--show-error", "--max-time", "25", "--connect-timeout", "10", "--proto", "=https",curl reads the player's
~/.curlrc(%APPDATA%\_curlrcon Windows) unless--disable/-qis the first argument. Alocation,proxy,insecureoroutputline there breaks the promise of https only and no redirects, and the source-text test can't see it. Put"--disable"first.@ -952,0 +1348,4 @@const char *const args[] = {"--silent", "--show-error", "--max-time", "25", "--connect-timeout", "10", "--proto", "=https","--header", "Content-Type: application/json", "--user-agent", "longshot-crash-report","--data-binary", data, "--dump-header", headers, "--output", answer, s->reports};const int ran = spawn_exe(curl, args, (int)(sizeof args / sizeof args[0]), 30000, NULL);Two things here:
spawn_exereturns 2 and leaves it running, and the page then says "Nothing was sent", which may be false. Kill it, or word the page as "may not have been sent".environas it is,LD_LIBRARY_PATHandLD_PRELOADincluded.own_scopestrips both for busctl; strip them here too, so the system curl can't load the game's libraries or an overlay's.The window is also not redrawn for up to 30 s while this waits. On Windows it shows "Not responding" after about 5 s.
@ -952,0 +1380,4 @@sent = hos_crash_answer(result, sizeof result, status, body, s->issue, link, sizeof link, &again);free(body);if (sent) keep_answer(s, status, link);fprintf(stderr, "[hos crash] sent on its own (longshot_crash.ini): %s\n", sent ? link : result);The helper's stderr is
/dev/nullon Linux and nothing on Windows (spawn_exe), so this line never reaches a log, although docs/crash-report-window.md says it does. The payload is also deleted just below. For the send with no window, keep a copy of what was sent (inbug-reports/sent/<record>beside the status and link, likeperf_sent/), and write this line to a file that persists.@ -549,0 +937,4 @@hos_crash_devices_out(s);for (int d = 0; d < ndevices; d++) {const size_t dn = strlen(devices[d]);for (char *at; dn >= 3 && (at = strstr(s, devices[d]));) {This loop calls
strstrfrom the start ofsevery time and grows the string in place, without checkingcap. If the microphone's name is a substring of<device>(dev,vice,device), it never ends and writes past the buffer. With a shorter name (3 to 7 bytes), each hit grows the text by8 - dnbytes past what the caller made room for. Search on fromat + 8, and build into a separate buffer bounded bycap, ashos_crash_redact_linedoes.hos_crash_devices_out'smemmove(name + 8, ...)(line 846) has the same growth.@ -26,3 +26,3 @@assert 'r.value != &output_pick' in menu and 'audio_output_device_id=%s' in menuassert 'output_forced()' in menu and 'audio_output_device_name' in menuassert '#define MKWVK_API_VERSION 24' in apiassert int(re.search(r'#define MKWVK_API_VERSION (\d+)', api).group(1)) >= 24 # (24: the playback callbacks; later versions append)This loosens the check (
== 24becomes>= 24, andfields[-6:]becomes an index search), which AGENTS.md asks us not to do. Main's version of this test now asserts== 25exactly, withmic_testlast. After the rebase, keep the exact form:== 26, withperf_infoasserted as the field aftermic_test.@ -70,3 +71,3 @@#include "audio_output_devices.h"#include "gpu/vk/vk_api.h"_Static_assert(MKWVK_API_VERSION == 24, "playback callbacks need a new ABI version");_Static_assert(MKWVK_API_VERSION >= 24, "playback callbacks need a new ABI version");Same here:
== 26after the rebase, not>= 24.View command line instructions
Manual merge helper
Use this merge commit message when completing the merge manually.
Checkout
From your project repository, check out a new branch and test the changes.