mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-26 02:11:36 -04:00
f5362f4ce9
Native-wide perf attribution instrumentation (permanent): - Each wide-mirror pass (tex-batch mirror, flat-geometry mirror, overlay full-width rect, wide_clear) is bracketed with a GL_TIMESTAMP pair (glQueryCounter; TIME_ELAPSED cannot nest inside the frame scene query). Pairs pool per buffered frame (1024/frame), summed at readback into mirror_gpu_ms + mirror_passes per sample; frame_perf now reports mirror_gpu_ms_avg/max, canon_gpu_ms_avg (scene minus mirror), mirror_passes_avg and mirror_pass_us for wide frames. - New debug cmd gl_ws_ablate mode=<0..3>: 0 normal, 1 skip mirror passes entirely, 2 mirror state churn without draws, 3 mirror draws stay on the hr FBO (no per-pass FBO rebind; content-corrupting perf probe). First MMX6 16:9 measurements with the split: mirror passes cost 20-125us EACH (FBO ping-pong penalty per pass) but MMX6 2D batches to ~3-15 passes/frame so 16:9 attract holds ~60fps on this branch; the per-pass cost x ~900 immediate flat prims is exactly the Tomba2 3D 60ms scene. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
149 lines
7.3 KiB
C
149 lines
7.3 KiB
C
#ifndef PSX_GPU_GL_RENDERER_H
|
|
#define PSX_GPU_GL_RENDERER_H
|
|
|
|
/* GL backend context + present entry points, called from main.cpp's window
|
|
* setup and present path when [video] renderer = "opengl". The backend's
|
|
* rasterization vtable is obtained separately via gl_backend_get()
|
|
* (gpu_render.h). SDL_Window is forward-declared (SDL typedefs it from this
|
|
* same struct tag) so this header needs no SDL include. */
|
|
|
|
#include <stdint.h>
|
|
|
|
struct SDL_Window;
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Create the GL context on a window made with SDL_WINDOW_OPENGL.
|
|
* Returns 1 on success, 0 to fall back to the SDL_Renderer present path. */
|
|
int gl_renderer_init_context(struct SDL_Window *win);
|
|
|
|
/* Set the GL swap interval / vsync mode (1=vsync, 0=immediate, -1=adaptive).
|
|
* Safe before or after context creation; applies live when a context exists. */
|
|
void gl_renderer_set_swap_interval(int interval);
|
|
|
|
/* Present an ARGB8888 image (BGRA byte order) as a letterboxed quad + swap.
|
|
* Used for 24-bit (FMV) frames and the PSX_GL_FORCE_CPU_PRESENT diagnostic.
|
|
* force_4_3 = pillarbox at native 4:3 even on a wide display aspect (FMVs
|
|
* are authored 4:3 and get no GTE squash to compensate the stretch). */
|
|
void gl_renderer_present(const uint32_t *pixels, int src_w, int src_h, int linear,
|
|
int force_4_3);
|
|
|
|
/* Clear to black + swap (display-disabled frame). */
|
|
void gl_renderer_present_blank(void);
|
|
|
|
/* Sync the authoritative FBO down to CPU VRAM if the GPU side is ahead (else
|
|
* a no-op). The 24-bit (FMV) present path, screenshots, and the debug server
|
|
* call this before reading CPU VRAM. */
|
|
void gl_renderer_sync_cpu(void);
|
|
|
|
/* THE present path for 15-bit frames: blit the display region straight from
|
|
* the authoritative VRAM FBO into a letterboxed rect (no readback).
|
|
* Deterministic — used for every 15-bit frame. linear = filter on scale.
|
|
* force_4_3 pins to native 4:3 (15-bit MDEC FMV frames on a wide aspect). */
|
|
void gl_renderer_present_vram(int disp_x, int disp_y, int w, int h, int linear,
|
|
int force_4_3);
|
|
|
|
/* GPU-direct native-wide present: blit the displayed buffer's wide FBO (key =
|
|
* disp_x) straight to the window, no CPU readback. Returns 0 if no wide surface
|
|
* exists for disp_x (caller falls back to the CPU readout path). */
|
|
int gl_renderer_present_wide_fbo(int disp_x, int disp_y, int disp_h, int linear);
|
|
|
|
/* Display aspect for the present letterbox (default 4:3). A wide aspect
|
|
* stretches the 4:3 frame; pair with gte_set_display_aspect (cpu_state.h)
|
|
* for the widescreen field-of-view hack. */
|
|
void gl_renderer_set_display_aspect(int num, int den);
|
|
|
|
void gl_renderer_shutdown(void);
|
|
|
|
/* Diagnostics (debug server): read GPU-side VRAM without touching the CPU
|
|
* array; report coherency flags + dirty rects. fbo_peek returns 0 when the
|
|
* GL pipeline is inactive. */
|
|
int gl_renderer_fbo_peek(int x, int y, int w, int h, uint16_t *out);
|
|
void gl_renderer_diag(int *gpu_dirty, int pending[5], int pack[5]);
|
|
|
|
/* Always-on coherency event ring (debug server "gl_coh_ring"): every upload
|
|
* flush, fill, copy, draw bbox, pack, full readback, present, and probe
|
|
* perturbation, with rect + frame. An op that flushes internally records its
|
|
* own event AFTER the FLUSH it caused (the event after a FLUSH = trigger). */
|
|
enum {
|
|
GL_COH_FLUSH = 1, /* CPU->FBO upload flush (pending box) */
|
|
GL_COH_FILL = 2, /* GP0(02) fill rect */
|
|
GL_COH_COPY_SRC = 3, /* GP0(80) copy, source rect */
|
|
GL_COH_COPY = 4, /* GP0(80) copy, dest rect */
|
|
GL_COH_DRAW = 5, /* drawn prim bbox (clipped to draw area) */
|
|
GL_COH_PACK = 6, /* hr FBO -> raw mirror pack (dirty box) */
|
|
GL_COH_ENSURE = 7, /* full FBO -> CPU VRAM readback */
|
|
GL_COH_PRESENT = 8, /* 15-bit present blit (display rect) */
|
|
GL_COH_UPLOAD = 9, /* bulk CPU->VRAM transfer_in dest rect */
|
|
GL_COH_PEEK = 10, /* gl_fbo_peek probe (perturbs: flushes) */
|
|
GL_COH_DIFF = 11, /* gl_vram_diff probe (perturbs: flushes) */
|
|
};
|
|
|
|
typedef struct {
|
|
uint32_t frame;
|
|
uint8_t kind;
|
|
int16_t x0, y0, x1, y1; /* native VRAM coords, inclusive */
|
|
} GlCohEvent;
|
|
|
|
uint64_t gl_renderer_coh_total(void);
|
|
/* Fetch event by absolute sequence number; 0 if evicted or out of range. */
|
|
int gl_renderer_coh_get(uint64_t seq, GlCohEvent *out);
|
|
|
|
/* Always-on present ring (debug server "gl_present_ring"): EVERY SwapWindow —
|
|
* including blank (display-disabled) and CPU-quad presents, which the coherency
|
|
* ring does not record — with the path taken, source display rect, letterbox
|
|
* dest rect, a glGetError sample, wall-clock ms, and a backbuffer pixel sampled
|
|
* at the letterbox centre right before the swap (the ground truth for "did this
|
|
* swap present black"). */
|
|
enum {
|
|
GL_PRES_VRAM = 0, /* 15-bit FBO blit present (gl_renderer_present_vram) */
|
|
GL_PRES_WIDE = 1, /* native-wide FBO blit present */
|
|
GL_PRES_CPU = 2, /* CPU-readout quad present (24-bit FMV / forced) */
|
|
GL_PRES_BLANK = 3, /* display-disabled black present */
|
|
};
|
|
|
|
typedef struct {
|
|
uint32_t frame; /* s_frame_count at swap */
|
|
uint32_t t_ms; /* SDL_GetTicks() at swap */
|
|
uint8_t path; /* GL_PRES_* */
|
|
uint8_t px_r, px_g, px_b; /* backbuffer sample at letterbox centre */
|
|
uint16_t glerr; /* glGetError() drained just before the swap */
|
|
int16_t dx, dy, w, h; /* source display rect (native px; 0 for blank) */
|
|
int16_t lx, ly, lw, lh; /* letterbox dest rect (window px) */
|
|
uint8_t src_r, src_g, src_b, src_valid; /* blit SOURCE (hr FBO) sample
|
|
* at the display-rect centre */
|
|
} GlPresEvent;
|
|
|
|
uint64_t gl_renderer_pres_total(void);
|
|
int gl_renderer_pres_get(uint64_t seq, GlPresEvent *out);
|
|
|
|
/* frame_perf: aggregate the per-frame GPU/CPU phase-timing ring (debug server
|
|
* "frame_perf"). wide_filter: -1 = all frames, 0 = 4:3 present, 1 = native-wide.
|
|
* Fills out[13]: [0]=count, [1]=total_ms avg, [2]=total_ms max, [3]=emu_cpu_ms avg
|
|
* (frame minus the present call), [4]=present_wall_ms avg, [5]=scene_gpu_ms avg,
|
|
* [6]=scene_gpu_ms max, [7]=present_gpu_ms avg, [8]=present_gpu_ms max,
|
|
* [9]=scene primitives/frame avg (pre double-draw), [10]=mirror_gpu_ms avg (of
|
|
* scene_gpu, the native-wide mirror passes; GL_TIMESTAMP pairs), [11]=mirror_gpu_ms
|
|
* max, [12]=mirror passes/frame avg. GPU phases are true GL_TIME_ELAPSED times
|
|
* (CPU-overhead independent). Returns the count. */
|
|
int gl_renderer_perf_aggregate(int wide_filter, double out[13]);
|
|
|
|
/* Native-wide mirror ablation (perf attribution, debug cmd gl_ws_ablate):
|
|
* 0 = normal, 1 = skip the whole mirror pass (incl. wide_clear), 2 = full mirror
|
|
* state churn without the draw calls, 3 = mirror draws stay on the hr FBO (no
|
|
* per-pass FBO rebind; diagnostic only — corrupts both surfaces' content). */
|
|
void gl_renderer_set_ws_ablate(int mode);
|
|
int gl_renderer_get_ws_ablate(void);
|
|
|
|
/* Cumulative textured fraction of scene primitives since boot (flat vs textured
|
|
* batching decision). Sets *out_tex_frac; returns total prim count. */
|
|
uint64_t gl_renderer_perf_prim_split(double *out_tex_frac);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* PSX_GPU_GL_RENDERER_H */
|