From ed8a9c6b8e061fe772fc0050ab83c2dec2db8d1e Mon Sep 17 00:00:00 2001 From: Arthur Hanson Rasmusson Date: Mon, 16 Nov 2026 09:50:31 -0500 Subject: vgsp: eng89 - live-derived GS map, draw-move anchor, raster enables, async capture Kernel (deterministic fixes, each with an A/B knob): - sema_gl_sph_gs_maps=6: derive the whole 216-bit GS IMAP/OMAP blocks from the bound VTG image's OMAP and the PS image's IMAP at authoring time (SPH-GS-MAP receipt; SPH-GS-SKIP names ps-invalid/gs-invalid/ vtg-overlap/vtg-short). maps=4 stays as the fallback. - DS-MAP census line: dump stage-4/5 w5/w10/w13/w17 next to DS-IMAGE so the fetched maps are visible without a new probe. - MME pack carrier: reject maxa > 4096 (the IR pack array) instead of 64K, with MME-PACK-REJECT reason=bound. - MME-DRAW-MOVE: anchor the slot-34 move after a 0x3810 VERTEX_STREAM run. c848 moved CALL(34) to 0x204, ahead of the prepended stream bind, so the 8x3 fetch used stale stream state. - sema_gl_raster_enable=1: emit SET_RASTER_ENABLE=1 and SET_GLOBAL_RENDER_ENABLE MODE_TRUE in the raster prelude (fresh replay contexts may carry 0 for both, discarding every fragment). Guest tooling (unblocks the render loop and capture): - sdl_cap.c: asynchronous PBO+fence capture with a 5 s abandonment bound; no glFinish/blocking readback (c899 wedged gzdoom in an uninterruptible nv ioctl); clean sentinel from a destructor. - gz_pbuf.c: request depth 24/stencil 8, log GL_DEPTH_BITS, and swap with glFlush only. - mission-gz.sh: gl_frames probe off by default; GZDoom launched detached with a bounded wait, per-attempt X restart and retry; capture in /dev/shm with GZCAP_MAXF. - gzdoom_pbuf_run.sh: gl_pipeline_depth=2, gl_finishbeforeswap=0, GZCAP_MAXF default, rc-file support for the detached run. - run_cycles_long.sh: durable multi-cycle runner (the previous one lived in /tmp and was lost on reboot); pushes tools, runs the mission, grabs dmesg + guest logs + capture per cycle, stops on pixels. Test matrix: params-r1624-maps{4,6}.txt. --- tools/guest-diag/gz_pbuf.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tools/guest-diag/gz_pbuf.c') diff --git a/tools/guest-diag/gz_pbuf.c b/tools/guest-diag/gz_pbuf.c index 5c03732..ddd9d00 100644 --- a/tools/guest-diag/gz_pbuf.c +++ b/tools/guest-diag/gz_pbuf.c @@ -42,6 +42,7 @@ static int make_pb(int w, int h) GLX_RENDER_TYPE, GLX_RGBA_BIT, GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, GLX_ALPHA_SIZE, 8, + GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_DOUBLEBUFFER, False, None }; @@ -88,7 +89,14 @@ void *SDL_GL_CreateContext(SDL_Window *win) } g_win = win; glXMakeCurrent(g_dpy, g_pb, g_ctx); - fprintf(stderr, "[gzpbuf] pbuffer %dx%d ctx=%p\n", g_w, g_h, (void *)g_ctx); + { + GLint db = -1, sb = -1; + + glGetIntegerv(GL_DEPTH_BITS, &db); + glGetIntegerv(GL_STENCIL_BITS, &sb); + fprintf(stderr, "[gzpbuf] pbuffer %dx%d ctx=%p depth=%d stencil=%d\n", + g_w, g_h, (void *)g_ctx, (int)db, (int)sb); + } return (void *)g_ctx; } @@ -107,7 +115,14 @@ int SDL_GL_MakeCurrent(SDL_Window *win, void *ctx) void SDL_GL_SwapWindow(SDL_Window *win) { (void)win; - glFinish(); + /* + * 2026-11-16 (c899): never glFinish here. The emulated GPU's work does + * not retire, and a blocking finish puts GZDoom in an uninterruptible + * nv ioctl that even SIGKILL cannot reap (the mission then hangs for + * minutes). glFlush only submits; sdl_cap's async PBO+fence harvest + * decides when a frame is actually ready. + */ + glFlush(); } void SDL_GL_GetDrawableSize(SDL_Window *win, int *w, int *h) -- cgit v1.2.3