mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
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:
parent
34c73fb452
commit
0e9bebce0f
5 changed files with 32 additions and 634 deletions
30
Cargo.lock
generated
30
Cargo.lock
generated
|
@ -2657,7 +2657,7 @@ checksum = "dcf29e94d6d243368b7a56caa16bc213e4f9f8ed38c4d9557069527b5d5281ca"
|
|||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"gpu-descriptor-types",
|
||||
"hashbrown",
|
||||
"hashbrown 0.15.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -3047,6 +3047,16 @@ dependencies = [
|
|||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.15.2"
|
||||
|
@ -3861,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
"hashbrown 0.15.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -4726,13 +4736,14 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
|
|||
[[package]]
|
||||
name = "naga"
|
||||
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 = [
|
||||
"arrayvec",
|
||||
"bit-set",
|
||||
"bitflags 2.8.0",
|
||||
"cfg_aliases",
|
||||
"codespan-reporting",
|
||||
"hashbrown 0.14.5",
|
||||
"hexf-parse",
|
||||
"indexmap",
|
||||
"log",
|
||||
|
@ -4741,7 +4752,7 @@ dependencies = [
|
|||
"strum",
|
||||
"termcolor",
|
||||
"thiserror 2.0.9",
|
||||
"unicode-xid",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -8630,14 +8641,14 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
|
|||
[[package]]
|
||||
name = "wgpu-core"
|
||||
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 = [
|
||||
"arrayvec",
|
||||
"bit-vec",
|
||||
"bitflags 2.8.0",
|
||||
"cfg_aliases",
|
||||
"document-features",
|
||||
"hashbrown",
|
||||
"hashbrown 0.14.5",
|
||||
"indexmap",
|
||||
"log",
|
||||
"naga",
|
||||
|
@ -8655,7 +8666,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "wgpu-hal"
|
||||
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 = [
|
||||
"android_system_properties",
|
||||
"arrayvec",
|
||||
|
@ -8671,7 +8682,7 @@ dependencies = [
|
|||
"gpu-alloc",
|
||||
"gpu-allocator",
|
||||
"gpu-descriptor",
|
||||
"hashbrown",
|
||||
"hashbrown 0.14.5",
|
||||
"js-sys",
|
||||
"khronos-egl",
|
||||
"libc",
|
||||
|
@ -8700,12 +8711,13 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "wgpu-types"
|
||||
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 = [
|
||||
"bitflags 2.8.0",
|
||||
"js-sys",
|
||||
"log",
|
||||
"serde",
|
||||
"thiserror 2.0.9",
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
|
|
|
@ -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_traits = { path = "components/shared/webrender" }
|
||||
webxr-api = { path = "components/shared/webxr" }
|
||||
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "d8e7ab1ad13f2bf2f9702401d1bc625e26b1c2e6" }
|
||||
wgpu-types = { 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 = "d8833d079833c62b4fd00325d0ba08ec0c8bc309" }
|
||||
winapi = "0.3"
|
||||
windows-sys = "0.59"
|
||||
wio = "0.2"
|
||||
|
|
|
@ -639,12 +639,11 @@ impl<'a> Convert<ProgrammableStageDescriptor<'a>> for &GPUProgrammableStage {
|
|||
.entryPoint
|
||||
.as_ref()
|
||||
.map(|ep| Cow::Owned(ep.to_string())),
|
||||
constants: Cow::Owned(
|
||||
self.constants
|
||||
.as_ref()
|
||||
.map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect())
|
||||
.unwrap_or_default(),
|
||||
),
|
||||
constants: self
|
||||
.constants
|
||||
.as_ref()
|
||||
.map(|records| records.iter().map(|(k, v)| (k.0.clone(), **v)).collect())
|
||||
.unwrap_or_default(),
|
||||
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::GPUBufferBinding(ref b) => {
|
||||
BindingResource::Buffer(BufferBinding {
|
||||
buffer_id: b.buffer.id().0,
|
||||
buffer: b.buffer.id().0,
|
||||
offset: b.offset,
|
||||
size: b.size.and_then(wgt::BufferSize::new),
|
||||
})
|
||||
|
|
|
@ -116,6 +116,7 @@ skip = [
|
|||
"foreign-types-shared",
|
||||
"metal",
|
||||
"windows-core",
|
||||
"hashbrown",
|
||||
|
||||
# wgpu-hal depends on 0.5.0.
|
||||
"ndk-sys",
|
||||
|
|
618
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
618
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue