Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4a9fc7e
Update egui-wgpu to use wgpu version 28.0.0
JasperBRiedel Dec 18, 2025
4b1710f
Update MSRV from 1.88.0 to 1.92.0
JasperBRiedel Dec 18, 2025
1681016
Fix typo causing error reading Clippy's configuration file
JasperBRiedel Dec 18, 2025
3fe4fda
Remove lint `clippy::string_to_string` as `clippy:implicit_clone` covers
JasperBRiedel Dec 18, 2025
98dcc26
Update lint `clippy::unchecked_duration_subtraction` has been renamed to
JasperBRiedel Dec 18, 2025
df53296
Resolve clippy warnings
JasperBRiedel Dec 19, 2025
28feaad
Remove needless `fn main` in `egui_kittest` doctest to satisfy
JasperBRiedel Dec 19, 2025
5b9022e
Resolve `clippy::collapsible_if` warnings in `eframe` crate under
JasperBRiedel Dec 19, 2025
514d356
Resolve typos error rasied by check script
JasperBRiedel Dec 19, 2025
615fdd4
Safety comment needed to be under attributes
JasperBRiedel Dec 19, 2025
7056bb6
Fix rustdoc unresolved link errors
JasperBRiedel Dec 19, 2025
0ff21fd
Apply nightly clippy suggestions/fixes (#7794)
JasperBRiedel Dec 20, 2025
e16b267
Apply preferred font weight when loading variable fonts (#7790)
pmnxis Dec 19, 2025
f4c74f3
Revert unrelated YAML formatting changes
JasperBRiedel Dec 20, 2025
9bdae8c
Fix unresolved link error in doc comment
JasperBRiedel Dec 20, 2025
9fc78de
Merge branch 'main' into wgpu-update
JasperBRiedel Dec 20, 2025
29539dd
Clippy expect `unwrap_used` in `egui_demo_lib` benchmark
JasperBRiedel Dec 20, 2025
4da655f
Added missing `multiview_mask` in `web_painter_wgpu.rs`
JasperBRiedel Dec 20, 2025
245a438
Resolve `clippy::useless_let_if_seq` in `eframe` `web_painter_wgpu.rs`
JasperBRiedel Dec 20, 2025
209ec7a
Merge branch 'main' into wgpu-update
JasperBRiedel Dec 21, 2025
8ba849b
Regenerate Cargo.lock to resolve windows build failing
JasperBRiedel Dec 21, 2025
a5c5e1d
Revert "Regenerate Cargo.lock to resolve windows build failing"
JasperBRiedel Jan 2, 2026
7b9ea1c
Update `accesskit_winit` 0.29.1 to 0.29.2
JasperBRiedel Jan 2, 2026
d6e3f05
Update `accesskit_consumer` 0.30.1 to 0.31.0
JasperBRiedel Jan 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
244 changes: 131 additions & 113 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ egui_kittest = { version = "0.33.3", path = "crates/egui_kittest", default-featu
eframe = { version = "0.33.3", path = "crates/eframe", default-features = false }

accesskit = "0.21.1"
accesskit_consumer = "0.30.1"
accesskit_winit = "0.29.1"
accesskit_consumer = "0.31.0"
accesskit_winit = "0.29.2"
ahash = { version = "0.8.12", default-features = false, features = [
"no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
"std",
Expand Down Expand Up @@ -143,7 +143,7 @@ wayland-cursor = { version = "0.31.11", default-features = false }
web-sys = "0.3.77"
web-time = "1.1.0" # Timekeeping for native and web
webbrowser = "1.0.5"
wgpu = { version = "27.0.1", default-features = false, features = ["std"] }
wgpu = { version = "28.0.0", default-features = false, features = ["std"] }
windows-sys = "0.61.2"
winit = { version = "0.30.12", default-features = false }

Expand Down
17 changes: 8 additions & 9 deletions crates/eframe/src/web/web_painter_wgpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ impl WebPainter for WebPainterWgpu {
label: Some("egui_render"),
occlusion_query_set: None,
timestamp_writes: None,
multiview_mask: None,
});

// Forgetting the pass' lifetime means that we are no longer compile-time protected from
Expand All @@ -280,15 +281,13 @@ impl WebPainter for WebPainterWgpu {
);
}

let mut capture_buffer = None;

if capture && let Some(capture_state) = &mut self.screen_capture_state {
capture_buffer = Some(capture_state.copy_textures(
&render_state.device,
&output_frame,
&mut encoder,
));
}
let capture_buffer = if capture
&& let Some(capture_state) = &mut self.screen_capture_state
{
Some(capture_state.copy_textures(&render_state.device, &output_frame, &mut encoder))
} else {
None
};

Some((output_frame, capture_buffer))
};
Expand Down
3 changes: 2 additions & 1 deletion crates/egui-wgpu/src/capture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl CaptureState {
},
depth_stencil: None,
multisample: MultisampleState::default(),
multiview: None,
multiview_mask: None,
cache: None,
});

Expand Down Expand Up @@ -165,6 +165,7 @@ impl CaptureState {
depth_stencil_attachment: None,
occlusion_query_set: None,
timestamp_writes: None,
multiview_mask: None,
});

pass.set_pipeline(&self.pipeline);
Expand Down
4 changes: 3 additions & 1 deletion crates/egui-wgpu/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ impl RenderState {
};

instance.enumerate_adapters(backends)
};
}
.await;

let (adapter, device, queue) = match config.wgpu_setup.clone() {
WgpuSetup::CreateNew(WgpuSetupCreateNew {
Expand Down Expand Up @@ -395,6 +396,7 @@ pub fn adapter_info_summary(info: &wgpu::AdapterInfo) -> String {
driver,
driver_info,
backend,
..
} = &info;

// Example values:
Expand Down
4 changes: 2 additions & 2 deletions crates/egui-wgpu/src/renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ impl Renderer {
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("egui_pipeline_layout"),
bind_group_layouts: &[&uniform_bind_group_layout, &texture_bind_group_layout],
push_constant_ranges: &[],
immediate_size: 0,
});

let depth_stencil = options
Expand Down Expand Up @@ -426,7 +426,7 @@ impl Renderer {
})],
compilation_options: wgpu::PipelineCompilationOptions::default()
}),
multiview: None,
multiview_mask: None,
cache: None,
}
)
Expand Down
1 change: 1 addition & 0 deletions crates/egui-wgpu/src/winit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ impl Painter {
}),
timestamp_writes: None,
occlusion_query_set: None,
multiview_mask: None,
});

// Forgetting the pass' lifetime means that we are no longer compile-time protected from
Expand Down
4 changes: 2 additions & 2 deletions crates/egui_demo_app/src/apps/custom3d_wgpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl Custom3d {
let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("custom3d"),
bind_group_layouts: &[&bind_group_layout],
push_constant_ranges: &[],
immediate_size: 0,
});

let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
Expand All @@ -62,7 +62,7 @@ impl Custom3d {
primitive: wgpu::PrimitiveState::default(),
depth_stencil: None,
multisample: wgpu::MultisampleState::default(),
multiview: None,
multiview_mask: None,
cache: None,
});

Expand Down
1 change: 1 addition & 0 deletions crates/egui_demo_app/src/backend_panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
driver,
driver_info,
backend,
..
} = &info;

// Example values:
Expand Down
Loading