Skip to content

Commit 5036d97

Browse files
Upgrade to wgpu 30 (bevyengine#24841)
# Objective Upgrade to [wgpu 30](https://github.com/gfx-rs/wgpu/releases/tag/v30.0.0) ## Solution - [x] Update and merge [naga_oil](bevyengine/naga_oil#139) - [x] Publish naga_oil - [x] Update and merge [dlss_wgpu](bevyengine/dlss_wgpu#31) - [x] publish dlss_wgpu - [x] remove dependency patches for naga_oil and dlss_wgpu ### Relevant Changes - new NoopBackendOptions fields: gfx-rs/wgpu#9119 - SurfaceColorSpace: gfx-rs/wgpu#9658 - get_mapped_range returns a Result: gfx-rs/wgpu#9281 - empty BufferSlices no longer panic: gfx-rs/wgpu#8505 - vertex buffer slots are optional now: gfx-rs/wgpu#9351 - `SurfaceTexture::present()` has been replaced by `Queue::present(surface_texture)`: gfx-rs/wgpu#9361 - Disallow direct access to atomic variables in WGSL front-end (e.g. let x = myAtomic;) gfx-rs/wgpu#9262. (affects solari) ## Testing - [x] 3d_scene - [x] solari with dlss ## Showcase #### 3d_scene on macos <img width="1728" height="1084" alt="image" src="https://github.com/user-attachments/assets/5ce80506-6924-4359-b469-92c32f06a505" /> #### ssao on macos <img width="1728" height="1084" alt="image" src="https://github.com/user-attachments/assets/8302ead7-54dc-44f9-8e71-a619d96c499e" /> #### bevy_city on macos <img width="1728" height="1084" alt="image" src="https://github.com/user-attachments/assets/4db1eba7-1c9b-4c54-95fe-1dc42ffc0e9e" /> #### Solari on Windows 11 <img width="1282" height="752" alt="image" src="https://github.com/user-attachments/assets/2a367a06-f167-4b73-a781-6a2c5e4065dd" />
1 parent 93fb3f5 commit 5036d97

38 files changed

Lines changed: 78 additions & 59 deletions

File tree

‎assets/shaders/texture_binding_array.wgsl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
enable wgpu_binding_array;
2+
13
#import bevy_pbr::forward_io::VertexOutput
24

35
@group(#{MATERIAL_BIND_GROUP}) @binding(0) var textures: binding_array<texture_2d<f32>>;

‎crates/bevy_anti_alias/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ bevy_diagnostic = { path = "../bevy_diagnostic", version = "0.20.0-dev" }
3434

3535
# other
3636
tracing = { version = "0.1", default-features = false, features = ["std"] }
37-
dlss_wgpu = { version = "4.0.0", optional = true }
37+
dlss_wgpu = { version = "5.0.0", optional = true }
3838
uuid = { version = "1.21.0", optional = true }
3939

4040
[lints]

‎crates/bevy_camera/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bevy_color = { path = "../bevy_color", version = "0.20.0-dev", features = [
2828
bevy_window = { path = "../bevy_window", version = "0.20.0-dev" }
2929

3030
# other
31-
wgpu-types = { version = "29.0.3", default-features = false }
31+
wgpu-types = { version = "30", default-features = false }
3232
serde = { version = "1", default-features = false, features = ["derive"] }
3333
thiserror = { version = "2", default-features = false }
3434
downcast-rs = { version = "2", default-features = false, features = ["std"] }

‎crates/bevy_clipboard/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.20.0-dev", default-fea
2929
[target.'cfg(any(windows, unix))'.dependencies]
3030
bevy_asset = { path = "../bevy_asset", version = "0.20.0-dev", default-features = false, optional = true }
3131
bevy_image = { path = "../bevy_image", version = "0.20.0-dev", default-features = false, optional = true }
32-
wgpu-types = { version = "29.0.3", default-features = false, optional = true }
32+
wgpu-types = { version = "30", default-features = false, optional = true }
3333
arboard = { version = "3.6.1", default-features = false, optional = true }
3434

3535
[target.'cfg(target_arch = "wasm32")'.dependencies]

‎crates/bevy_color/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = [
2020
], default-features = false, optional = true }
2121
thiserror = { version = "2", default-features = false }
2222
derive_more = { version = "2", default-features = false, features = ["from"] }
23-
wgpu-types = { version = "29.0.3", default-features = false, optional = true }
23+
wgpu-types = { version = "30", default-features = false, optional = true }
2424
encase = { version = "0.12", default-features = false, optional = true }
2525

2626
[features]

‎crates/bevy_gltf/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ serde = { version = "1.0", features = ["derive"] }
6767
serde_json = "1.0.140"
6868
smallvec = { version = "1", default-features = false }
6969
tracing = { version = "0.1", default-features = false, features = ["std"] }
70-
wgpu-types = { version = "29.0.3", default-features = false }
70+
wgpu-types = { version = "30", default-features = false }
7171

7272
[dev-dependencies]
7373
bevy_log = { path = "../bevy_log", version = "0.20.0-dev" }

‎crates/bevy_image/Cargo.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ image = { version = "0.25.2", default-features = false }
7373
# misc
7474
bitflags = { version = "2.3", features = ["serde"] }
7575
bytemuck = { version = "1.5" }
76-
wgpu-types = { version = "29.0.3", default-features = false, features = [
77-
"serde",
78-
] }
76+
wgpu-types = { version = "30", default-features = false, features = ["serde"] }
7977
serde = { version = "1", features = ["derive"] }
8078
thiserror = { version = "2", default-features = false }
8179
futures-lite = "2.0.1"

‎crates/bevy_light/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ bevy_log = { path = "../bevy_log", version = "0.20.0-dev" }
2929

3030
# other
3131
tracing = { version = "0.1", default-features = false }
32-
wgpu-types = { version = "29.0.3", default-features = false }
32+
wgpu-types = { version = "30", default-features = false }
3333
half = "2.7.1"
3434
smallvec = { version = "1", default-features = false }
3535

‎crates/bevy_material/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.20.0-dev" }
2323
encase = "0.12"
2424
tracing = { version = "0.1", default-features = false, features = ["std"] }
2525
thiserror = { version = "2", default-features = false }
26-
wgpu-types = { version = "29.0.3", default-features = false }
26+
wgpu-types = { version = "30", default-features = false }
2727
variadics_please = "2.0"
2828
smallvec = { version = "1", default-features = false }
2929

‎crates/bevy_mesh/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.20.0-dev", default-fea
2727
# other
2828
bitflags = { version = "2.3", features = ["serde"] }
2929
bytemuck = { version = "1.5" }
30-
wgpu-types = { version = "29.0.3", default-features = false }
30+
wgpu-types = { version = "30", default-features = false }
3131
serde = { version = "1", default-features = false, features = [
3232
"derive",
3333
], optional = true }

0 commit comments

Comments
 (0)