fix(render): one fence per frame for the vertex ring; two qt6 adapter fixes
The persistent-mapped instance ring had three slots and recorded a fence per upload, so a frame recycled a slot whose fence was recorded a few draws earlier *in that same frame*: from the fourth of the demos' nine uploads on, each one waited on the frame's own work. It is free on a driver that retires draws promptly (the GLFW host, 1.07 ms/frame) and ~4 ms of the Qt widget's 7.11 ms under llvmpipe, and it grows with the trace and cursor counts this library exists for. * The ring grows to cover a frame's upload count, the frame's write cursor is the ring index (so a frame writes 0, 1, 2, ... and never a slot twice), one fence is recorded after the frame's last draw, and the only wait is at the start of the next frame. A wait that times out, or a slot written with no fence ever recorded behind it, drops the store to the orphan path -- the treatment a refused fence already had -- so nothing is ever written into storage the GPU may still be reading. * New test-only counters (PLOT_RING_STATS, the PLOT_PYRAMID_COUNT_* pattern: free functions, no member, so no consumer's layout changes) pin a frame's upload and wait counts. The new tests assert the frame's slot offsets are distinct, that the ring grew past its floor to cover the frame, and that a frame waits at most once per store -- read from the counters and from glClientWaitSync itself. * qt6: print the unresolved entry-point names before the load-failure branch, which used to return first and leave the one failure this widget can have reporting nothing but a generic message. * qt6: the cached pointer anchor is now in logical pixels and a move's delta is the logical difference scaled by the DPR in effect, so a scale change between two move events (the window dragged onto another monitor mid-drag) is no longer a cross-scale jump applied as a pan. The anchor moved into a toolkit-free unit (adapters/qt6/qt_pointer.hpp) with its own test. GLFW demo headless: 1.07 -> 0.73 ms/frame. Qt widget under xvfb/llvmpipe: 7.1 -> 3.8 ms at dpr 1.0, 6.7 -> 3.6 ms at 1.25, with both upload paths still rendering and the demo's scripted pan/box-zoom checks passing at both scales.
This commit is contained in:
1 parent
1ee2dd9c3d
commit
3c0e7763ab
13 files changed
+626
-113
No files matched your search
@@ -80,6 +80,12 @@ class Renderer {
|
||||
/// `viewport_px` (top-left origin, like every `Rect` in this library) into GL's
|
||||
/// bottom-left origin once, clears that region to `style().background` and
|
||||
/// empties the staging batches.
|
||||
///
|
||||
/// It is also where the instance stores wait -- once each -- for the previous
|
||||
/// frame's draws to retire the ring they read, before this frame writes any
|
||||
/// slot (see `InstanceStore::begin_frame`): a frame never synchronises with the
|
||||
/// work it issued itself. A store that cannot retire that frame drops to the
|
||||
/// baseline path, which this frame reports (see `last_frame_had_gl_error()`).
|
||||
void begin_frame(u32 fb_w, u32 fb_h, Rect viewport_px) noexcept;
|
||||
|
||||
/// Draws `plot`, refreshing its layout, ticks and grid first.
|
||||
@@ -98,6 +104,10 @@ class Renderer {
|
||||
/// Ends the frame, draining `glGetError()` in a loop so a stale error cannot be
|
||||
/// attributed to a later frame (see `last_frame_had_gl_error()`).
|
||||
///
|
||||
/// It also records each instance store's single fence for the frame, behind
|
||||
/// every draw that read the ring, which is what the next `begin_frame()` waits
|
||||
/// on (see `InstanceStore::mark_drawn`).
|
||||
///
|
||||
/// The GL state it leaves behind, so a host can embed the plot without guessing:
|
||||
/// vertex array 0, program 0, `GL_ARRAY_BUFFER` 0, texture unit 0 active and
|
||||
/// nothing bound to `GL_TEXTURE_2D` on it, blending off, scissoring off, and the
|
||||
@@ -115,7 +125,7 @@ class Renderer {
|
||||
|
||||
/// True when the last frame reported a GL failure: an error drained from
|
||||
/// `glGetError()` in `end_frame()`, or a fence the driver refused, which the
|
||||
/// store reports when the draw that should have been guarded is issued (such a
|
||||
/// store reports when the frame's fence is recorded or waited on (such a
|
||||
/// frame has already fallen back to the baseline path). Errors are drained in a
|
||||
/// loop, so a stale one cannot be attributed to a later frame.
|
||||
bool last_frame_had_gl_error() const noexcept { return gl_error_; }
|
||||
|
||||
Reference in new issue
Block a user