Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

chore: Update wgpu again (#33635)

Browse source 
* Update wgpu again

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

* Update expectations

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

* Update components/webgpu/swapchain.rs

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>

* Update components/webgpu/wgpu_thread.rs

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
Signed-off-by: Samson <16504129+sagudev@users.noreply.github.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Samson 2024-10-04 19:29:24 +02:00 • committed by GitHub
parent 57d96653eb
commit 20eb927843
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 1548 additions and 5229 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -4530,7 +4530,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
[[package]] [[package]]
name = "naga" name = "naga"
version = "22.0.0" version = "22.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20#9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" source = "git+https://github.com/gfx-rs/wgpu?rev=3d584f99edfc57055000fdc88c3131f5bacf3ee7#3d584f99edfc57055000fdc88c3131f5bacf3ee7"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bit-set", "bit-set",
@ -8153,7 +8153,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "22.0.0" version = "22.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20#9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" source = "git+https://github.com/gfx-rs/wgpu?rev=3d584f99edfc57055000fdc88c3131f5bacf3ee7#3d584f99edfc57055000fdc88c3131f5bacf3ee7"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bit-vec", "bit-vec",
@ -8178,7 +8178,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-hal" name = "wgpu-hal"
version = "22.0.0" version = "22.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20#9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" source = "git+https://github.com/gfx-rs/wgpu?rev=3d584f99edfc57055000fdc88c3131f5bacf3ee7#3d584f99edfc57055000fdc88c3131f5bacf3ee7"
dependencies = [ dependencies = [
"android_system_properties", "android_system_properties",
"arrayvec", "arrayvec",
@ -8220,7 +8220,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "22.0.0" version = "22.0.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20#9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" source = "git+https://github.com/gfx-rs/wgpu?rev=3d584f99edfc57055000fdc88c3131f5bacf3ee7#3d584f99edfc57055000fdc88c3131f5bacf3ee7"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"js-sys", "js-sys",

4
Cargo.toml
View file

@ -143,8 +143,8 @@ webpki-roots = "0.25"
webrender = { git = "https://github.com/servo/webrender", branch = "0.65", features = ["capture"] } webrender = { git = "https://github.com/servo/webrender", branch = "0.65", features = ["capture"] }
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" } webrender_api = { git = "https://github.com/servo/webrender", branch = "0.65" }
webrender_traits = { path = "components/shared/webrender" } webrender_traits = { path = "components/shared/webrender" }
wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" } wgpu-core = { git = "https://github.com/gfx-rs/wgpu", rev = "3d584f99edfc57055000fdc88c3131f5bacf3ee7" }
wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "9f85f8aeea6c43c1a412bafc8fbcfb43aad0dd20" } wgpu-types = { git = "https://github.com/gfx-rs/wgpu", rev = "3d584f99edfc57055000fdc88c3131f5bacf3ee7" }
windows-sys = "0.59" windows-sys = "0.59"
xi-unicode = "0.3.0" xi-unicode = "0.3.0"
xml5ever = "0.20" xml5ever = "0.20"

2
components/webgpu/swapchain.rs
View file

@ -501,7 +501,7 @@ impl crate::WGPU {
let _guard = self.poller.lock(); let _guard = self.poller.lock();
global global
.queue_submit(queue_id, &[command_buffer_id]) .queue_submit(queue_id, &[command_buffer_id])
.map_err(Error::from_error)?; .map_err(|(_, error)| Error::from_error(error))?;
} }
let callback = { let callback = {
let global = Arc::clone(&self.global); let global = Arc::clone(&self.global);

2
components/webgpu/wgpu_thread.rs
View file

@ -1005,7 +1005,7 @@ impl WGPU {
let _guard = self.poller.lock(); let _guard = self.poller.lock();
global global
.queue_submit(queue_id, &command_buffers) .queue_submit(queue_id, &command_buffers)
.map_err(Error::from_error) .map_err(|(_, error)| Error::from_error(error))
}; };
self.maybe_dispatch_error(device_id, result.err()); self.maybe_dispatch_error(device_id, result.err());
}, },

6761
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini vendored
View file

File diff suppressed because it is too large Load diff