Skip to content

Commit 3eebb96

Browse files
committed
Update wgpu 0.27
1 parent 031fec1 commit 3eebb96

File tree

12 files changed

+24
-13
lines changed

12 files changed

+24
-13
lines changed

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@ indexmap = "2.9"
1414
pollster = "0.4"
1515
image = "0.25"
1616
bytemuck = { version = "1.20", features = ["derive"] }
17-
wgpu = { version = "25.0", features = ["naga-ir"] }
17+
wgpu = { version = "27.0", features = ["naga-ir"] }
1818
winit = { version = "0.30" }
1919

2020
[dev-dependencies]
21-
# ToDo: Update to 0.32 when can
22-
egui = { version = "0.32" }
23-
egui-wgpu = { version = "0.32" }
24-
egui-winit = { version = "0.32" }
25-
egui_extras = { version = "0.32" }
26-
egui_demo_lib = { version = "0.32" }
27-
rapier2d = { version = "0.26", features = ["default", "debug-render"] }
21+
egui = { version = "0.33" }
22+
egui-wgpu = { version = "0.33" }
23+
egui-winit = { version = "0.33" }
24+
egui_extras = { version = "0.33" }
25+
egui_demo_lib = { version = "0.33" }
26+
rapier2d = { version = "0.31.0", features = ["default", "debug-render"] }
2827
rand = "0.9"
2928
glam = "0.30"
3029

@@ -34,6 +33,7 @@ field_reassign_with_default = "allow"
3433
self_named_constructors = "allow"
3534
too_long_first_doc_paragraph = "allow"
3635
uninlined_format_args = "allow"
36+
default_constructed_unit_structs = "allow"
3737

3838
[profile.dev]
3939
opt-level = 3

examples/egui_gui.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use egui::{FullOutput, ViewportId};
22
use egui_demo_lib::DemoWindows;
3-
use egui_wgpu::ScreenDescriptor;
3+
use egui_wgpu::{RendererOptions, ScreenDescriptor};
44
use egui_winit::EventResponse;
55
use glass::{
66
window::{GlassWindow, RenderData, WindowConfig},
@@ -76,9 +76,7 @@ impl GuiState {
7676
let renderer = egui_wgpu::Renderer::new(
7777
context.device(),
7878
GlassWindow::default_surface_format(),
79-
None,
80-
1,
81-
true,
79+
RendererOptions::default(),
8280
);
8381
GuiState {
8482
egui_ctx: ctx,
@@ -175,6 +173,7 @@ fn render_egui(
175173
label: None,
176174
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
177175
view: &view,
176+
depth_slice: None,
178177
resolve_target: None,
179178
ops: wgpu::Operations {
180179
load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),

examples/game_of_life/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ fn render(app: &mut GameOfLifeApp, render_data: RenderData) -> Option<Vec<Comman
230230
label: None,
231231
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
232232
view: &view,
233+
depth_slice: None,
233234
resolve_target: None,
234235
ops: wgpu::Operations {
235236
load: wgpu::LoadOp::Clear(wgpu::Color::WHITE),

examples/lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ impl GlassApp for LineApp {
209209
impulse_joint_set,
210210
multibody_joint_set,
211211
ccd_solver,
212-
None,
213212
&(),
214213
&(),
215214
);
@@ -254,6 +253,7 @@ fn add_render_commands(app: &mut LineApp, render_data: RenderData) -> Option<Vec
254253
label: None,
255254
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
256255
view: &view,
256+
depth_slice: None,
257257
resolve_target: None,
258258
ops: wgpu::Operations {
259259
load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),

examples/multiple_windows/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ fn render(_app: &mut MultiWindowApp, render_data: RenderData) -> Option<Vec<Comm
9494
label: None,
9595
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
9696
view: &view,
97+
depth_slice: None,
9798
resolve_target: None,
9899
ops: wgpu::Operations {
99100
load: wgpu::LoadOp::Clear(clear_color),

examples/quad/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ fn render(app: &mut TreeApp, render_data: RenderData) -> Option<Vec<CommandBuffe
106106
label: None,
107107
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
108108
view: &view,
109+
depth_slice: None,
109110
resolve_target: None,
110111
ops: wgpu::Operations {
111112
load: wgpu::LoadOp::Clear(wgpu::Color::BLACK),

examples/sand/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ fn render(app: &mut SandSim, render_data: RenderData) -> Option<Vec<CommandBuffe
184184
label: None,
185185
color_attachments: &[Some(RenderPassColorAttachment {
186186
view: &view,
187+
depth_slice: None,
187188
resolve_target: None,
188189
ops: Operations {
189190
load: LoadOp::Clear(Color::BLACK),

examples/triangle/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ fn render(app: &mut TriangleApp, render_data: RenderData) -> Option<Vec<CommandB
5454
label: None,
5555
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
5656
view: &view,
57+
depth_slice: None,
5758
resolve_target: None,
5859
ops: wgpu::Operations {
5960
load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),

src/device_context.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ impl DeviceContext {
155155
label: None,
156156
required_features: config.features,
157157
required_limits: config.limits.clone(),
158+
experimental_features: Default::default(),
158159
memory_hints: config.memory_hints.clone(),
159160
trace: Trace::Off,
160161
})) {

src/pipelines/bloom/pipeline.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ impl BloomPipeline {
373373
color_attachments: &[Some(RenderPassColorAttachment {
374374
// Write to bloom texture
375375
view,
376+
depth_slice: None,
376377
resolve_target: None,
377378
ops: Operations::default(),
378379
})],
@@ -399,6 +400,7 @@ impl BloomPipeline {
399400
label: Some("bloom_downsampling_pass"),
400401
color_attachments: &[Some(RenderPassColorAttachment {
401402
view,
403+
depth_slice: None,
402404
resolve_target: None,
403405
ops: Operations {
404406
load: LoadOp::Load,
@@ -434,6 +436,7 @@ impl BloomPipeline {
434436
label: Some("bloom_upsampling_pass"),
435437
color_attachments: &[Some(RenderPassColorAttachment {
436438
view,
439+
depth_slice: None,
437440
resolve_target: None,
438441
ops: Operations {
439442
load: LoadOp::Load,
@@ -474,6 +477,7 @@ impl BloomPipeline {
474477
label: Some("bloom_upsampling_final_pass"),
475478
color_attachments: &[Some(RenderPassColorAttachment {
476479
view: &bloom_target.views[0],
480+
depth_slice: None,
477481
resolve_target: None,
478482
ops: Operations {
479483
load: LoadOp::Load,

0 commit comments

Comments
 (0)