chore: Update wgpu (#35503)

* Update wgpu

d8833d0798
Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Update expectations

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* fix tidy

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
This commit is contained in:
Samson 2025-02-16 19:24:13 +01:00 committed by GitHub
parent 34c73fb452
commit 0e9bebce0f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 32 additions and 634 deletions

30
Cargo.lock generated
View file

@ -2657,7 +2657,7 @@ checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"gpu-descriptor-types", "gpu-descriptor-types",
"hashbrown", "hashbrown 0.15.2",
] ]
[[package]] [[package]]
@ -3047,6 +3047,16 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "hashbrown"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
"serde",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.15.2" version = "0.15.2"
@ -3861,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown", "hashbrown 0.15.2",
] ]
[[package]] [[package]]
@ -4726,13 +4736,14 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
[[package]] [[package]]
name = "naga" name = "naga"
version = "24.0.0" version = "24.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bit-set", "bit-set",
"bitflags 2.8.0", "bitflags 2.8.0",
"cfg_aliases", "cfg_aliases",
"codespan-reporting", "codespan-reporting",
"hashbrown 0.14.5",
"hexf-parse", "hexf-parse",
"indexmap", "indexmap",
"log", "log",
@ -4741,7 +4752,7 @@ dependencies = [
"strum", "strum",
"termcolor", "termcolor",
"thiserror 2.0.9", "thiserror 2.0.9",
"unicode-xid", "unicode-ident",
] ]
[[package]] [[package]]
@ -8630,14 +8641,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "24.0.0" version = "24.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bit-vec", "bit-vec",
"bitflags 2.8.0", "bitflags 2.8.0",
"cfg_aliases", "cfg_aliases",
"document-features", "document-features",
"hashbrown", "hashbrown 0.14.5",
"indexmap", "indexmap",
"log", "log",
"naga", "naga",
@ -8655,7 +8666,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-hal" name = "wgpu-hal"
version = "24.0.0" version = "24.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"arrayvec", "arrayvec",
@ -8671,7 +8682,7 @@ dependencies = [
"gpu-alloc", "gpu-alloc",
"gpu-allocator", "gpu-allocator",
"gpu-descriptor", "gpu-descriptor",
"hashbrown", "hashbrown 0.14.5",
"js-sys", "js-sys",
"khronos-egl", "khronos-egl",
"libc", "libc",
@ -8700,12 +8711,13 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "24.0.0" version = "24.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6#d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" source = "git+https://github.com/gfx-rs/wgpu?rev=d8833d079833c62b4fd00325d0ba08ec0c8bc309#d8833d079833c62b4fd00325d0ba08ec0c8bc309"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"js-sys", "js-sys",
"log", "log",
"serde", "serde",
"thiserror 2.0.9",
"web-sys", "web-sys",
] ]

View file

@ -163,8 +163,8 @@ webrender = { git = "https://github.com/servo/webrender", branch = "0.66", featu
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.66" } webrender_api = { git = "https://github.com/servo/webrender", branch = "0.66" }
webrender_traits = { path = "components/shared/webrender" } webrender_traits = { path = "components/shared/webrender" }
webxr-api = { path = "components/shared/webxr" } webxr-api = { path = "components/shared/webxr" }
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" }
wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" } wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" }
winapi = "0.3" winapi = "0.3"
windows-sys = "0.59" windows-sys = "0.59"
wio = "0.2" wio = "0.2"

View file

@ -639,12 +639,11 @@ impl<'a> Convert<ProgrammableStageDescriptor<'a>> for &GPUProgrammableStage {
.entryPoint .entryPoint
.as_ref() .as_ref()
.map(|ep| Cow::Owned(ep.to_string())), .map(|ep| Cow::Owned(ep.to_string())),
constants: Cow::Owned( constants: self
self.constants .constants
.as_ref() .as_ref()
.map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect()) .map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect())
.unwrap_or_default(), .unwrap_or_default(),
),
zero_initialize_workgroup_memory: true, zero_initialize_workgroup_memory: true,
} }
} }
@ -659,7 +658,7 @@ impl<'a> Convert<BindGroupEntry<'a>> for &GPUBindGroupEntry {
GPUBindingResource::GPUTextureView(ref t) => BindingResource::TextureView(t.id().0), GPUBindingResource::GPUTextureView(ref t) => BindingResource::TextureView(t.id().0),
GPUBindingResource::GPUBufferBinding(ref b) => { GPUBindingResource::GPUBufferBinding(ref b) => {
BindingResource::Buffer(BufferBinding { BindingResource::Buffer(BufferBinding {
buffer_id: b.buffer.id().0, buffer: b.buffer.id().0,
offset: b.offset, offset: b.offset,
size: b.size.and_then(wgt::BufferSize::new), size: b.size.and_then(wgt::BufferSize::new),
}) })

View file

@ -116,6 +116,7 @@ skip = [
"foreign-types-shared", "foreign-types-shared",
"metal", "metal",
"windows-core", "windows-core",
"hashbrown",
# wgpu-hal depends on 0.5.0. # wgpu-hal depends on 0.5.0.
"ndk-sys", "ndk-sys",

File diff suppressed because it is too large Load diff