forked from 1b-agent/opencadstudio-upstream
Tell the user when the scene is drawn without a GPU
A day of pan/zoom that had suddenly become unusable on a 1.2M-entity drawing turned out to be no regression at all: an unattended NVIDIA userspace update had been applied without a reboot, the Vulkan ICD could no longer talk to the still-loaded kernel module, and wgpu silently fell through to Mesa's llvmpipe. Nothing in the app said so. iced picks the adapter and names it only under RUST_LOG, so the only evidence was 32 `llvmpipe-N` threads in /proc. The same silence covers WARP on Windows, SwiftShader in browsers, and the case where wgpu finds no adapter at all and iced quietly draws the chrome with tiny-skia while the shader widget is dropped, leaving a blank viewport. This commit makes all of that visible, on every platform, without new dependencies. Detection (src/scene/pipeline/mod.rs) ------------------------------------- `GpuStatus` is derived from two signals: * `record_gpu_adapter`, run from `MultiPipeline::new` (once per device, next to the existing uncaptured-error handler), reads `Device::adapter_info()`, prints one `[gpu] adapter: <name> (<backend>, <device type>, driver …)` line — stderr natively, `console.warn` on the web, which has no stderr — and keeps a copy. * `note_scene_draw`, run from `ViewportPane::draw`, counts how often the viewport asked for a primitive. Every renderer makes that call; only wgpu goes on to `prepare` and create a device. Three draws with no device ever recorded therefore mean the primitive is being dropped. The verdict is one of `Unknown`, `Hardware`, `Software(adapter)` or `NoRenderer`. `Software` is `DeviceType::Cpu` — what Vulkan reports for llvmpipe, DX12 for WARP and GL for a renderer string that gives it away — plus a name match on the fallbacks browsers expose (SwiftShader, llvmpipe, lavapipe, "Microsoft Basic Render"), because the WebGPU backend reports every adapter as `Other` (gfx-rs/wgpu#8819). Metal has no software device, so on macOS only `NoRenderer` can occur (a VM without a GPU); it is caught by the draw count like everywhere else. `gpu_status_if_changed` costs one atomic load per app message: a generation counter moves only when a device is recorded or the draw count crosses its threshold, so the app re-derives the verdict a handful of times per session. Notification (src/app/startup.rs, view/modal.rs, ui/statusbar) ------------------------------------------------------------- `refresh_gpu_status` runs after every message. On a degraded verdict it speaks through three channels, because many users never read the command line: * A popup, `ModalKind::GpuWarning`, queued once per verdict through the startup-modal queue so it waits its turn behind the file open. It names the adapter, states the consequence (slow navigation, unstable or missing rendering) and gives the remedy that usually applies on the running platform: a driver update not yet followed by a reboot on Linux, a missing driver or a Remote Desktop / VM session on Windows, a VM without a Metal device on macOS, hardware acceleration switched off in the browser. "Don't show again for this device" stores `GpuStatus::identity()` in `settings.gpu_warning_silenced`; keying it by verdict means silencing "software rendering on llvmpipe" does not silence a later, different failure. * A status-bar pill in the theme's warning colours, `⚠ Software rendering` or `⚠ No GPU renderer`. It is not a `StatusPill`, so it cannot be hidden, and it stays for the session; clicking it reopens the popup, silenced or not. * A command-line entry through the new `CommandLine::push_warning`, which is styled like an error but deliberately does not touch `last_error` / `error_revision`: automation reads those to decide whether the command it just ran failed, and a graphics warning is not a failed command. `subscription()` requests frames only while the verdict is `Unknown` on a document tab (the Start page draws no viewport), so the probe costs one frame on a working GPU, three on none, then stops. Verification ------------ * Live on the machine that had the incident, with the Vulkan loader restricted to Mesa (`VK_DRIVER_FILES=…/lvp_icd.json WGPU_BACKEND=vulkan`): popup → OK → pill → click reopens; "Don't show again" → restart → pill only, no popup. * `gpu_tests::the_adapter_is_reported_once_per_device` (ignored, needs an adapter) asserts the classification on a real device; it was run on both llvmpipe (`Cpu`) and an NVIDIA GT 1030 (`DiscreteGpu`). * Unit tests cover the name heuristic, the verdict function, the identity rule, the warning text with an adapter name that itself contains parentheses and commas, the settings round trip and the command-line semantics. New strings are in all 21 locales as the `gpu` Fluent group. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
1 parent
5f161bb037
commit
02b0f4c7d9
34 files changed
+875
No files matched your search
@@ -727,6 +727,14 @@ pub(super) struct OpenCADStudio {
|
||||
/// of OS windows).
|
||||
active_modal: Option<ModalKind>,
|
||||
pending_startup_modals: std::collections::VecDeque<ModalKind>,
|
||||
/// What is drawing the scene, once the first frame has told us. Drives
|
||||
/// the graphics warning (popup, status-bar pill, command line).
|
||||
gpu_status: crate::scene::pipeline::GpuStatus,
|
||||
/// The pipeline's status generation this app has already looked at.
|
||||
gpu_status_generation: u64,
|
||||
/// `GpuStatus::identity()` of the verdict whose popup the user silenced
|
||||
/// with "Don't show again for this device". Persisted in the settings.
|
||||
gpu_warning_silenced: String,
|
||||
/// Plot modal geometry preserved while the Plot Style editor is open as
|
||||
/// a child dialog. None means Plotstyle was opened directly (e.g. command).
|
||||
plotstyle_parent_plot_geometry: Option<(iced::Vector, iced::Vector)>,
|
||||
@@ -1739,6 +1747,10 @@ pub enum ModalKind {
|
||||
/// Add / remove the annotation scales a single selected object has a
|
||||
/// per-object representation for.
|
||||
AnnoObjectScale,
|
||||
/// The scene is drawn by a software rasterizer, or not at all: what that
|
||||
/// means and what usually fixes it. Queued once per verdict; the status
|
||||
/// bar's ⚠ pill reopens it.
|
||||
GpuWarning,
|
||||
}
|
||||
|
||||
/// A property group controlled by a layer state's restore mask.
|
||||
@@ -2861,6 +2873,12 @@ pub enum Message {
|
||||
PropConstraintLinkClick(Vec<acadrust::Handle>),
|
||||
// ── About window ────────────────────────────────────────────────────
|
||||
AboutOpen,
|
||||
// ── Graphics warning ────────────────────────────────────────────────
|
||||
/// The status bar's ⚠ pill: reopen the graphics warning.
|
||||
GpuWarningOpen,
|
||||
/// "Don't show again for this device": close the warning and remember
|
||||
/// the verdict it described, so only a different one prompts again.
|
||||
GpuWarningSilence,
|
||||
/// Close whatever in-canvas modal dialog is open (Plan B).
|
||||
CloseModal,
|
||||
// ── Attribute editor dialog ───────────────────────────────────────────
|
||||
@@ -3613,6 +3631,9 @@ impl OpenCADStudio {
|
||||
recent_colors: Vec::new(),
|
||||
active_modal: None,
|
||||
pending_startup_modals: std::collections::VecDeque::new(),
|
||||
gpu_status: crate::scene::pipeline::GpuStatus::Unknown,
|
||||
gpu_status_generation: 0,
|
||||
gpu_warning_silenced: String::new(),
|
||||
plotstyle_parent_plot_geometry: None,
|
||||
find_replace: FindReplaceState::default(),
|
||||
aec_drop_acknowledged: false,
|
||||
|
||||
@@ -238,6 +238,11 @@ pub struct UserSettings {
|
||||
pub default_assoc_prompted: bool,
|
||||
/// App version whose donation prompt has been displayed.
|
||||
pub donation_prompt_version: String,
|
||||
/// The graphics verdict (`GpuStatus::identity()`) whose warning popup the
|
||||
/// user chose not to see again. Empty = always show. Keyed by verdict so
|
||||
/// silencing "software rendering on llvmpipe" does not silence a later,
|
||||
/// different failure.
|
||||
pub gpu_warning_silenced: String,
|
||||
/// Ids of plugins the user turned off in the Plugin Manager. Disabled
|
||||
/// plugins keep their manifest listed but drop their ribbon tab and command
|
||||
/// dispatch.
|
||||
@@ -398,6 +403,7 @@ impl Default for UserSettings {
|
||||
otrack: false,
|
||||
default_assoc_prompted: false,
|
||||
donation_prompt_version: String::new(),
|
||||
gpu_warning_silenced: String::new(),
|
||||
disabled_plugins: Vec::new(),
|
||||
plugin_repos: Vec::new(),
|
||||
literal_spaces: false,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use super::{ModalKind, OpenCADStudio};
|
||||
use crate::scene::pipeline::{GpuAdapter, GpuStatus};
|
||||
|
||||
impl OpenCADStudio {
|
||||
pub(super) fn queue_startup_prompts(&mut self) {
|
||||
@@ -23,6 +24,51 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
|
||||
/// Notice when the scene is drawn by a software rasterizer, or not at
|
||||
/// all, and say so everywhere the user might look: the command line,
|
||||
/// the log, a one-time popup, and a status-bar pill that stays.
|
||||
///
|
||||
/// Runs after every message; the pipeline records the adapter when iced
|
||||
/// first builds a device and counts the viewport's draws in the meantime,
|
||||
/// so the verdict lands on the first message after the first frame
|
||||
/// (`subscription` keeps frames ticking until it does). A working GPU
|
||||
/// gets no word here — the `[gpu] adapter:` log line already names it.
|
||||
pub(super) fn refresh_gpu_status(&mut self) {
|
||||
let Some(status) =
|
||||
crate::scene::pipeline::gpu_status_if_changed(&mut self.gpu_status_generation)
|
||||
else {
|
||||
return;
|
||||
};
|
||||
if status == self.gpu_status {
|
||||
return;
|
||||
}
|
||||
self.gpu_status = status;
|
||||
let Some(identity) = self.gpu_status.identity() else {
|
||||
return;
|
||||
};
|
||||
match &self.gpu_status {
|
||||
GpuStatus::Software(adapter) => {
|
||||
self.command_line.push_warning(&software_rasterizer_warning(adapter));
|
||||
}
|
||||
GpuStatus::NoRenderer => {
|
||||
crate::scene::pipeline::report_gpu_line(
|
||||
"[gpu] no adapter: wgpu found nothing to draw with; the interface is on \
|
||||
iced's software renderer and the scene is not drawn at all",
|
||||
);
|
||||
self.command_line
|
||||
.push_warning(&crate::tr!("gpu", "command-line-no-renderer"));
|
||||
}
|
||||
GpuStatus::Unknown | GpuStatus::Hardware(_) => {}
|
||||
}
|
||||
// The popup: once per verdict, unless the user silenced this one.
|
||||
let already_queued = self.active_modal == Some(ModalKind::GpuWarning)
|
||||
|| self.pending_startup_modals.contains(&ModalKind::GpuWarning);
|
||||
if self.gpu_warning_silenced != identity && !already_queued {
|
||||
self.pending_startup_modals.push_back(ModalKind::GpuWarning);
|
||||
self.show_next_startup_modal();
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn mark_startup_modal_shown(&mut self) {
|
||||
if self.active_modal.is_some()
|
||||
&& self.active_modal.as_ref() == self.pending_startup_modals.front()
|
||||
@@ -38,10 +84,77 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
|
||||
/// The command-line warning for a software rasterizer, naming the adapter so
|
||||
/// the user can tell llvmpipe from SwiftShader from WARP.
|
||||
pub(super) fn software_rasterizer_warning(adapter: &GpuAdapter) -> String {
|
||||
let adapter = &adapter.name;
|
||||
crate::tf!("GPU unavailable — rendering in software on the CPU ({adapter}). Large drawings will navigate slowly; check the graphics driver (a driver update without a reboot is the usual cause).")
|
||||
.into_owned()
|
||||
}
|
||||
|
||||
/// What usually puts a machine in this state, per platform. The cause is
|
||||
/// almost always outside the app, and it differs: on Linux it is a driver
|
||||
/// updated under a running kernel module, on Windows a driver that is
|
||||
/// missing or a session (Remote Desktop, a VM) that has no GPU to offer, on
|
||||
/// macOS a VM without a Metal device, in a browser hardware acceleration
|
||||
/// switched off.
|
||||
pub(crate) fn gpu_platform_hint() -> String {
|
||||
if cfg!(target_arch = "wasm32") {
|
||||
crate::tr!("gpu", "hint-web")
|
||||
} else if cfg!(target_os = "windows") {
|
||||
crate::tr!("gpu", "hint-windows")
|
||||
} else if cfg!(target_os = "macos") {
|
||||
crate::tr!("gpu", "hint-macos")
|
||||
} else {
|
||||
crate::tr!("gpu", "hint-linux")
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::app::{config::AppConfig, Message};
|
||||
use iced::wgpu;
|
||||
|
||||
#[test]
|
||||
fn the_software_warning_names_the_adapter_and_every_platform_has_a_hint() {
|
||||
let cpu = GpuAdapter {
|
||||
name: "llvmpipe (LLVM 20.1.8, 256 bits)".to_string(),
|
||||
backend: wgpu::Backend::Vulkan,
|
||||
device_type: wgpu::DeviceType::Cpu,
|
||||
};
|
||||
let warning = software_rasterizer_warning(&cpu);
|
||||
// The name carries parentheses and commas of its own; the localized
|
||||
// template must still place it whole. The loader follows the system
|
||||
// locale here, so the assertions stay language-neutral.
|
||||
assert!(warning.contains("(llvmpipe (LLVM 20.1.8, 256 bits))"), "{warning}");
|
||||
assert!(warning.contains("GPU"), "{warning}");
|
||||
assert!(!warning.contains("{adapter}") && !warning.contains("__ocs_"), "{warning}");
|
||||
// Every platform has a hint, and it is a sentence, not a missing key.
|
||||
let hint = gpu_platform_hint();
|
||||
assert!(hint.len() > 20 && !hint.contains("hint-"), "{hint}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn silencing_the_popup_is_per_verdict_and_survives_a_settings_round_trip() {
|
||||
let mut app = OpenCADStudio::new_for_test();
|
||||
app.gpu_status = GpuStatus::NoRenderer;
|
||||
let _ = app.update(Message::GpuWarningSilence);
|
||||
assert_eq!(app.gpu_warning_silenced, "no-renderer");
|
||||
assert!(app.active_modal.is_none());
|
||||
|
||||
let saved = serde_json::to_string(&app.current_config()).unwrap();
|
||||
let mut restarted = OpenCADStudio::new_for_test();
|
||||
restarted.apply_config(serde_json::from_str(&saved).unwrap());
|
||||
assert_eq!(restarted.gpu_warning_silenced, "no-renderer");
|
||||
// A different verdict is not covered by that choice.
|
||||
let software = GpuStatus::Software(GpuAdapter {
|
||||
name: "llvmpipe".to_string(),
|
||||
backend: wgpu::Backend::Vulkan,
|
||||
device_type: wgpu::DeviceType::Cpu,
|
||||
});
|
||||
assert_ne!(software.identity().unwrap(), restarted.gpu_warning_silenced);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn donation_prompt_persists_once_per_version() {
|
||||
|
||||
@@ -414,6 +414,7 @@ impl OpenCADStudio {
|
||||
otrack: self.snapper.otrack_enabled,
|
||||
default_assoc_prompted: self.default_assoc_prompted,
|
||||
donation_prompt_version: self.donation_prompt_version.clone(),
|
||||
gpu_warning_silenced: self.gpu_warning_silenced.clone(),
|
||||
disabled_plugins: {
|
||||
let mut v: Vec<String> = self.disabled_plugins.iter().cloned().collect();
|
||||
v.sort();
|
||||
@@ -493,6 +494,7 @@ impl OpenCADStudio {
|
||||
self.snapper.otrack_enabled = s.otrack;
|
||||
self.default_assoc_prompted = s.default_assoc_prompted;
|
||||
self.donation_prompt_version = s.donation_prompt_version.clone();
|
||||
self.gpu_warning_silenced = s.gpu_warning_silenced.clone();
|
||||
self.disabled_plugins = s.disabled_plugins.iter().cloned().collect();
|
||||
self.plugin_repos = s.plugin_repos.clone();
|
||||
self.command_line.literal_spaces = s.literal_spaces;
|
||||
|
||||
@@ -288,6 +288,7 @@ impl OpenCADStudio {
|
||||
}
|
||||
}
|
||||
let task = self.update_inner(msg);
|
||||
self.refresh_gpu_status();
|
||||
self.show_next_startup_modal();
|
||||
self.sync_open_command_history();
|
||||
// Close the document-level first-touch transaction started by
|
||||
@@ -6577,6 +6578,16 @@ impl OpenCADStudio {
|
||||
Task::none()
|
||||
}
|
||||
|
||||
Message::GpuWarningOpen => {
|
||||
self.active_modal = Some(super::ModalKind::GpuWarning);
|
||||
Task::none()
|
||||
}
|
||||
Message::GpuWarningSilence => {
|
||||
self.gpu_warning_silenced = self.gpu_status.identity().unwrap_or_default();
|
||||
self.close_active_modal();
|
||||
Task::none()
|
||||
}
|
||||
|
||||
Message::CloseModal => {
|
||||
if self.active_modal == Some(super::ModalKind::RecoveryPrompt) {
|
||||
return self.update(Message::RecoveryDecline);
|
||||
|
||||
@@ -2225,6 +2225,7 @@ bg={bg_ms:.1}ms n={view_count}"
|
||||
status_menu_data,
|
||||
tab.scene.sketch_constraint_set(tab.current_sketch_scope()).and_then(|s| s.dof),
|
||||
tab.scene.sketch_constraint_set(tab.current_sketch_scope()).map(|s| s.conflicts.len()).unwrap_or(0),
|
||||
&self.gpu_status,
|
||||
)
|
||||
})
|
||||
.width(Fill)
|
||||
@@ -2479,6 +2480,18 @@ impl OpenCADStudio {
|
||||
} else {
|
||||
Subscription::none()
|
||||
};
|
||||
// Graphics verdict: a device appears inside the first frame and a
|
||||
// dropped scene shows up as draws without one, but neither arrives
|
||||
// as a message. Tick until the verdict is in — one frame on a
|
||||
// working GPU, three on none — then stop. The Start page draws no
|
||||
// viewport, so there is nothing to learn there.
|
||||
let gpu_probe = if matches!(self.gpu_status, crate::scene::pipeline::GpuStatus::Unknown)
|
||||
&& !self.tabs[self.active_tab].is_start
|
||||
{
|
||||
window::frames().map(Message::Tick)
|
||||
} else {
|
||||
Subscription::none()
|
||||
};
|
||||
let thumbnail_capture = if self.thumbnail_capture_clean {
|
||||
window::frames().map(|_| Message::ThumbnailCaptureFrame)
|
||||
} else {
|
||||
@@ -2685,6 +2698,7 @@ impl OpenCADStudio {
|
||||
grip_dwell,
|
||||
hover_dwell,
|
||||
nav_settle,
|
||||
gpu_probe,
|
||||
thumbnail_capture,
|
||||
caret_blink,
|
||||
web_fonts,
|
||||
|
||||
@@ -50,6 +50,7 @@ impl OpenCADStudio {
|
||||
Some(K::SaveDialog) => crate::tr!("modal", "save-drawing-as"),
|
||||
Some(K::Recovery) => crate::tr!("modal", "recovery-report"),
|
||||
Some(K::RecoveryPrompt) => crate::tr!("modal", "recovery-prompt"),
|
||||
Some(K::GpuWarning) => crate::tr!("gpu", "title"),
|
||||
None => String::new(),
|
||||
}
|
||||
}
|
||||
@@ -1378,6 +1379,9 @@ impl OpenCADStudio {
|
||||
super::super::ModalKind::DonationPrompt => {
|
||||
sized_flow(ex, 540, 360, donation_dialog_window)
|
||||
}
|
||||
super::super::ModalKind::GpuWarning => {
|
||||
sized_flow(ex, 520, 400, |flow| gpu_warning_window(&self.gpu_status, flow))
|
||||
}
|
||||
super::super::ModalKind::AecDropWarning => {
|
||||
let src_label = self
|
||||
.tabs
|
||||
@@ -1921,6 +1925,57 @@ fn layer_delete_warning_window(
|
||||
.into()
|
||||
}
|
||||
|
||||
/// What the graphics verdict means and what usually fixes it. Two
|
||||
/// situations share the dialog — a software rasterizer (slow, but drawing)
|
||||
/// and no renderer at all (a blank viewport) — and the remedy hint is per
|
||||
/// platform. "OK" closes it for this session; the status-bar pill brings it
|
||||
/// back. "Don't show again" silences this verdict only, so a different
|
||||
/// failure on the same machine still prompts.
|
||||
fn gpu_warning_window(
|
||||
status: &crate::scene::pipeline::GpuStatus,
|
||||
sizing: crate::ui::modal::ModalSizing,
|
||||
) -> Element<'static, Message> {
|
||||
use crate::scene::pipeline::GpuStatus;
|
||||
let (headline, consequences) = match status {
|
||||
GpuStatus::Software(adapter) => (
|
||||
crate::tr!("gpu", "software-headline", adapter = adapter.name.clone()),
|
||||
Some(crate::tr!("gpu", "software-consequences")),
|
||||
),
|
||||
_ => (crate::tr!("gpu", "no-renderer-headline"), None),
|
||||
};
|
||||
let mut body = column![text(headline).size(13)].spacing(8);
|
||||
if let Some(consequences) = consequences {
|
||||
body = body.push(text(consequences).size(13));
|
||||
}
|
||||
body = body.push(
|
||||
text(crate::app::startup::gpu_platform_hint())
|
||||
.size(13)
|
||||
.style(dialog_muted_text_style),
|
||||
);
|
||||
|
||||
container(
|
||||
column![
|
||||
body,
|
||||
Space::new().height(20),
|
||||
row![
|
||||
dialog_button(t!("OK"), Message::CloseModal, button::primary),
|
||||
Space::new().width(8),
|
||||
dialog_button(
|
||||
crate::tr!("gpu", "silence"),
|
||||
Message::GpuWarningSilence,
|
||||
button::secondary
|
||||
),
|
||||
],
|
||||
]
|
||||
.spacing(0),
|
||||
)
|
||||
.style(dialog_body_style)
|
||||
.center_x(sizing.width)
|
||||
.center_y(sizing.height)
|
||||
.padding([24, 28])
|
||||
.into()
|
||||
}
|
||||
|
||||
fn donation_dialog_window(sizing: crate::ui::modal::ModalSizing) -> Element<'static, Message> {
|
||||
container(
|
||||
column![
|
||||
|
||||
Reference in new issue
Block a user