* 3D view: moving the pointer over it draws no frame when nothing it lights up changes Over a still 3D view, every pointer move drew a whole frame (egui pass, view, present) even when the pointer stayed on the same face or on empty background, so laptops spent CPU, GPU and battery on frames identical to the last. The view now records, at the end of a frame, whether it is quiet: only hovered, with no tool, dialog, sketch, drag, held button, open menu, woken snap point or view movement (`viewport::QuietMotion`). Between frames the app answers eframe's question about each pointer move (`App::repaint_on_window_event`): the move needs no frame when the pointer stays on the view with no other widget reached (egui's hit test against the last frame's widgets) and the pick at the new position lights up the same face, edge, vertex, plane or nothing (`viewport::motion_changes_nothing`). The motion is still delivered with the next frame. Raw device motion draws no frame while the view is quiet; and over a quiet view egui is told that pointer motion needs no frame after the one it drew, unless control-channel input is queued. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * 3D view: a pointer move answered without a frame keeps the hover at the pointer The move is picked anyway to decide that it needs no frame; that pick (the same face, edge or plane, at the pointer) now becomes the hover, and the pointer position is kept, as the frame would have left them. Before, `ui.inspect` and the agents saw the point where the hover last changed until the next frame (an edge's or a face's `point` lagged behind the pointer), though nothing on screen differed. `viewport::motion_changes_nothing` is now `viewport::follow_pointer_without_frame`, since it records what it found. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * 3D view: pointer motion onto a joint glyph or an idle Joint Move handle draws a frame The glyph's tooltip and the handle's brightening are drawn by a frame, though what lights up under the pointer stays the same. A frame with the pointer on a glyph is not quiet either, so leaving the glyph hides its tooltip. Also puts wake_centre's doc comment back on wake_centre. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018WRx8erWfxRfxVtyfRiGSb * eframe: the repaint hooks are asked about the main window's events only A winit event carries no window to the app, so a pointer move over a detached panel window was read as a move over the main window's 3D view, and could skip that panel's frame. Every other window's events keep eframe's own answer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018WRx8erWfxRfxVtyfRiGSb * egui-winit: queued pointer motion collapses while no button is held With frames skipped for quiet pointer motion, the queue held one event per platform report until the next frame. Motion now joins the motion of the same kind at the end of the queue (the last position, the summed delta); other events keep their places, and a held button keeps the whole path. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018WRx8erWfxRfxVtyfRiGSb --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
15 KiB
Vendored third-party crates
Copies of third-party crates that SolidCraft builds with local fixes, wired in with
[patch.crates-io] in the workspace Cargo.toml. They keep their own licence; changed lines
are marked SolidCraft: in the source.
egui 0.37.0 (MIT OR Apache-2.0, Emil Ernerfeldt and contributors)
vendor/egui is egui's whole repository at tag 0.37.0 (commit 841a328ba2, https://github.com/emilk/egui),
added with git subtree add --squash, so SolidCraft can carry its own changes to egui, eframe and
egui-wgpu. Nothing of it is reorganised: SolidCraft's changes, listed below and marked SolidCraft:
in the source, and the images left out (below) are the only difference from upstream, so a
git subtree pull of a newer egui meets nothing but them. It keeps its own licences (both texts are
in it), tooling and rules: SolidCraft's checks do not apply to it, and the workspace excludes
vendor/.
Every egui crate SolidCraft builds is patched to it in the workspace Cargo.toml: ecolor,
eframe, egui, egui-wgpu, egui-winit, egui_glow, emath, epaint and
epaint_default_fonts. egui's own crates build and test there, for example
cargo test --manifest-path vendor/egui/Cargo.toml -p egui -p eframe --lib.
Images upstream keeps in Git LFS
The vendored tree is plain files; SolidCraft uses no Git LFS. Upstream keeps some images in Git
LFS (screenshot-test references, demo and media pictures, example screenshots, and the images
example's ferris.gif), and a subtree import brings them as LFS pointer files whose contents only
egui's own LFS storage has. They are left out of vendor/egui, with the filter=lfs lines of its
.gitattributes. None is in a crate SolidCraft builds; the images those crates use
(crates/eframe/data, crates/egui/assets) are plain files upstream too. Without them egui's
screenshot tests have nothing to compare against and its images example does not build.
Updating egui
GIT_LFS_SKIP_SMUDGE=1 git subtree pull --prefix=vendor/egui https://github.com/emilk/egui <tag> --squash
# Leave out the LFS images again (if the pull stops on a conflict, run these to resolve it):
git grep -lz 'git-lfs.github.com/spec' -- vendor/egui | xargs -0 -r git rm -q --
sed -i -e '/filter=lfs/d' -e '/LFS:$/d' -e '/!filter !diff !merge/d' vendor/egui/.gitattributes
git add vendor/egui/.gitattributes
git commit -m "vendor/egui: leave out the images upstream keeps in Git LFS"
git grep -l 'git-lfs.github.com/spec' -- vendor/egui # prints nothing
GIT_LFS_SKIP_SMUDGE=1 keeps Git LFS, where it is installed, from fetching the images while the
pull checks them out.
Conflicts can only come from SolidCraft's own changes and the images left out. Land the pull request
that does this with a merge commit, not a squash or a rebase: git subtree finds the last import by
its squash commit, and a squash merge rewrites it away. SolidCraft's changes can go back to a fork
of egui the same way, with git subtree split --prefix=vendor/egui or git subtree push --prefix=vendor/egui <egui fork> <branch>.
The shared viewport crate solidcraft-viewport-egui draws through egui-wgpu and relies on the
fixes below (above all, the drawable acquired before paint callbacks are prepared: without it the
cached offscreen picture is never drawn). Another workspace that uses that crate patches the egui
crates to this tree the same way, with
[patch.crates-io] egui-wgpu = { path = ".../vendor/egui/crates/egui-wgpu" } and the same for the others.
SolidCraft changes to egui and eframe:
crates/egui/src/data/input/raw_input.rs,crates/egui/src/input_state/mod.rs,crates/eframe/src/epi.rs,crates/eframe/src/native/{winit,wgpu,glow}_integration.rs: backport of emilk/egui#8768 (open upstream, against egui'smain).RawInput::repaint_on_pointer_move(default true) lets pointer motion alone ask for no further frame, andApp::repaint_on_window_event/App::repaint_on_device_eventlet a native app answerSome(false)to process a winit event without painting. The motion is still delivered with the next frame. Tests:pointer_motion_repaints_unless_asked_not_to(egui) andthe_app_can_override_the_repaint_an_event_asks_for(eframe). SolidCraft only: the two hooks are asked about the root viewport's events alone, since the event does not name its window; another window's events keep eframe's answer.crates/egui-winit/src/lib.rs: while no pointer button is held, queued pointer motion joins the motion of the same kind at the end of the queue (PointerMovedkeeps the last position,MouseMovedsums), so frames skipped for pointer motion do not pile up one event per platform report. Test:queued_pointer_motion_collapses_between_other_events.crates/egui/src/context.rs,crates/egui/src/lib.rs:Context::widget_hits_at(pos), the hit test the next pass would start with, run between passes against the last pass's widgets (begin_passand it shareprev_pass_hits);WidgetHitsis exported for it. Test:widget_hits_at_matches_the_next_pass.
The SolidCraft 3D view uses both to skip frames for pointer motion that changes nothing it
draws (viewport::follow_pointer_without_frame in crates/ui-egui).
SolidCraft changes to egui-wgpu (paths relative to crates/egui-wgpu; these lived in a
separate copy at vendor/egui-wgpu before egui was vendored as a whole):
src/setup.rs,src/lib.rs: let a named adapter selector defer to the normal wgpu request when the requested card is unavailable or incompatible with the window surface.src/lib.rs: use 1x MSAA on the selected OpenGL adapter before creating pipelines, exposing the effective sample count so host paint callbacks can match it.src/winit.rs: use that same effective count for depth and resolve attachments.src/renderer.rs: when the GPU refuses a staging buffer for a frame's meshes (device lost or out of memory), log a warning and draw nothing that frame instead of panicking (#1469).- Other backends retain requested MSAA, without another adapter or device probe.
src/lib.rs: clamp MSAA to the largest sample count the device supports for the surface and depth formats (supported_msaa_samples,RenderState::msaa_supported): a saved 8x on a device without it failed pipeline validation, a panic at start.src/setup.rs: the default device requestsTEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURESwhen the adapter has it, so 2x and 8x work where the adapter supports them (WebGPU only guarantees 1x and 4x).src/setup.rs: the default device asks for the adapter's largest 2D texture (at least 8192) instead of exactly 8192.src/lib.rs,src/winit.rs:set_startup_hookis told before each step of getting the device and the window's surface up (instance, surface, adapter request, the chosen adapter, device, renderer, surface configure, first present), so the app's crash journal can say which step a crash inside the graphics driver happened in.src/lib.rs,src/winit.rs: a window larger than the device's largest texture gets a surface clamped to it (clamp_surface_extent, aspect ratio kept) and egui is drawn at the matching smaller scale, instead of aSurface::configurevalidation panic (#869). The resize path and an unsupported surface no longer unwrap.src/winit.rs: acquire a drawable before preparing paint callbacks, so a skipped surface frame cannot discard initialization commands for cached viewport meshes.src/lib.rs,src/winit.rs: surfaces are configured undercapture_errors(error scopes): a configuration the device refuses (D3D12 "Failed to wait for GPU to come idle before reconfiguring the Surface", #1935) is logged, the frame is skipped and the configure is tried again, instead of the device's uncaptured-error handler panicking. A streak of refusals warns once (debug after), waits 16 ms doubling up to 1 s between tries and recreates the surface everySURFACE_RECREATE_AFTERrefusals (ConfigureRetry). Each surface keeps the deadline of its next try: until it is due, no configure or recreate happens, whether the repaint comes from input, an animation, a resize (its size is kept for the retry) or an outdated surface, and the frame is skipped with a repaint asked for when it is due. The streak and the deadline survive a recreate; a configure the device takes ends the streak, a recreate it asked for included. A recreate for a lost surface goes ahead as before.src/lib.rs,src/winit.rs: a window other than the main one (an immediate viewport, drawn and presented inside the main window's frame) is configured with Mailbox, else Immediate, when the configured mode waits for vsync and the surface offers one (viewport_present_mode). Waiting on both surfaces in one frame halved the frame rate, and on Wayland a window the compositor wasn't showing stalled the main window behind its present.src/lib.rs,src/winit.rs: the device's lost callback marksRenderState::device_lost(DeviceLost), and the painter draws nothing on a lost device. Before a frame's uploads it submits a command buffer holding a debug marker (DeviceLost::probe), so a device the driver lost is found by opening that command list rather than by the first queue write, which panicked inside wgpu-core (PendingWrites::activate, #4172). An empty submission only signalled a fence, which a reset D3D12 device let through (#6528). A reset that lands after the probe is still met by a queue write or the present: the painter runs the frame underDeviceLost::survive, which takes that panic for the loss once the probe then finds the device lost, and lets any other panic carry on (#10240).src/lib.rs,src/winit.rs: a surface configure that meets a lost device is not taken as configured (configure_captured): wgpu reports device-loss errors to no error scope, and on D3D12 a driver reset found by the configure has already dropped the surface's configuration. The next acquire failed with "Surface is not configured for presentation" and the device's default handler panicked (#7007). An unsupported surface is a refused configure too. The acquire runs undercapture_errors, and theValidationstatus it then returns reconfigures the surface instead of skipping every later frame.src/lib.rs,src/winit.rs: the painter holds an acquired frame asAcquiredFrame, which destroys a second handle to the frame's texture once the frame is presented or dropped. On a lost device wgpu's present and discard keep the frame's image in the surface, and dropping the surface (the window closing for the restart) then panicked in wgpu-hal ("Trying to destroy a SwapchainAcquireSemaphore that is still in use by a SurfaceTexture", #7148); the destroy takes the image back whatever the device's state.src/lib.rs: creation of the egui renderer uses validation, internal and out-of-memory error scopes, awaiting every result before returning it. A refused UI pipeline (D3D12egui_pipelineshader compilation, #6648) returnsWgpuError::CreateRendererErrorthrough eframe so startup can retry another backend instead of invoking wgpu's panic handler.
winit 0.30.13 (Apache-2.0, © The winit contributors, https://github.com/rust-windowing/winit)
Original package sources from the 0.30.13 release, with the upstream licence retained. Example
and test targets are dropped (their sources are not vendored); the new gesture module's unit
tests stay in src/platform_impl/linux/wayland/seat/pointer/pointer_gesture.rs
(cargo test -p winit --lib -- pointer_gesture).
SolidCraft changes:
src/platform_impl/linux/wayland/seat/pointer/pointer_gesture.rs(new): bindzwp_pointer_gestures_v1(versions 1..=3) when the compositor has it, create one pinch gesture object per pointer and destroy it before the pointer is released, and turn begin/update/end intoWindowEvent::PinchGestureandWindowEvent::RotationGesturefor the window the gesture began over. Two fingers only; the protocol's scale is relative to the gesture's beginning, so the event carries the change since the previous update; rotation is negated to winit's counterclockwise degrees; a non-finite scale is dropped, and so are updates of a gesture whose begin we never saw; surfaces that are not one of our windows (decorations, subsurfaces, other clients) do not take part. Backport of the gesture part of rust-windowing/winit#4338 (winit 0.31's Wayland gesture support; the 0.30 backport rust-windowing/winit#4778 was closed unmerged). A trackpad pinch otherwise produces no input at all on Wayland: egui-winit already mapsPinchGesturetoegui::Event::Zoom, andnavigation::handlealready zooms the camera from that, so the Wayland backend is the only missing piece. eframe 0.37 requires winit 0.30, so this cannot come from a newer winit.src/platform_impl/linux/wayland/seat/mod.rs,state.rs,seat/pointer/mod.rs: the global bound with the connection, the gesture object of each seat's pointer, and the module wiring.Cargo.toml: enable theunstablefeature ofwayland-protocolson the Linux dependency (thewp::pointer_gesturesmodule); drop the example and test targets.src/event.rs,src/changelog/unreleased.md: the platform notes of both events and the changelog entry.src/platform_impl/windows/event_loop.rs,window_state.rs,mod.rs,src/platform/windows.rs(set_quiet_window_move): a process-wide switch with which Windows' modal move and size loop (WM_ENTERSIZEMOVE…WM_EXITSIZEMOVE, entered when the title bar is dragged) no longer makes the app render once per move step. It is off by default, which is winit's own behaviour, so anything built on this copy is unchanged until it opts in; SolidCraft turns it on only when Preferences > Layout'swindows_smooth_window_dragis on (off by default). It is read at each message, so a change applies at once, and a paint or a move held back before it is turned off is still sent when the loop ends. With it on, while the window only moves (its size unchanged):Movedis coalesced and sent once, with the final position, atWM_EXITSIZEMOVE;WM_PAINTis validated withoutRedrawRequested, and one paint is requested when the loop ends; relative raw mouse motion is not sent as device events. Off, as in winit, everyWM_WINDOWPOSCHANGEDbecomesMoved, egui-winit asks for a repaint onMoved, and the redraw arrives asWM_PAINTinside the loop, so each step runs a full frame that blocks on the swapchain (acquire waits of 50-110 ms were measured on D3D12), and a frame that asked for the next one (eframe repaints on raw motion while it believes the press that started the drag is still held) keeps a paint loop spinning for the whole drag: the window moves at 10-40 fps. A resize, a snap or a DPI change inside the loop (a size change) paints live either way.src/platform_impl/windows/event_loop.rs(raw_motion): relative raw mouse motion is summed while more raw input is waiting in the queue (GetQueueStatus(QS_RAWINPUT)) and sent once per burst, so a high-rate mouse (8 kHz: about 7,000WM_INPUTa second) no longer makes three device events (Motionx,Motiony,MouseMotion) per report on the window thread. The summed motion is exact; motion is flushed before a button or wheel change in the same report stream, so the order of events is kept.