mirror of
https://github.com/servo/servo.git
synced 2025-09-17 10:28:22 +01:00
chore: update wgpu to v26 (#39016)
Vello has updated to wgpu v26 recently. It might be a good time for servo to update as well. This PR should wait for #39015 and #38717 Testing: WebGPU CTS Fixes: None --------- Signed-off-by: Wu Yu Wei <yuweiwu@pm.me>
This commit is contained in:
Wu Yuwei
GitHub
parent
2d5eac386f
commit
a0c3dcefe4
13 changed files with 635 additions and 208636 deletions
83
Cargo.lock
generated
83
Cargo.lock
generated
|
|
@ -247,7 +247,7 @@ dependencies = [
|
|||
"log",
|
||||
"ndk",
|
||||
"ndk-context",
|
||||
"ndk-sys 0.6.0+11769913",
|
||||
"ndk-sys",
|
||||
"num_enum",
|
||||
"thiserror 1.0.69",
|
||||
]
|
||||
|
|
@ -1718,7 +1718,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
|
|||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"core-foundation 0.9.4",
|
||||
"core-graphics-types",
|
||||
"core-graphics-types 0.1.3",
|
||||
"foreign-types",
|
||||
"libc",
|
||||
]
|
||||
|
|
@ -1734,6 +1734,17 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-graphics-types"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
|
||||
dependencies = [
|
||||
"bitflags 2.9.4",
|
||||
"core-foundation 0.10.1",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-text"
|
||||
version = "20.1.0"
|
||||
|
|
@ -5262,13 +5273,13 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "metal"
|
||||
version = "0.31.0"
|
||||
version = "0.32.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e"
|
||||
checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
|
||||
dependencies = [
|
||||
"bitflags 2.9.4",
|
||||
"block",
|
||||
"core-graphics-types",
|
||||
"core-graphics-types 0.2.0",
|
||||
"foreign-types",
|
||||
"log",
|
||||
"objc",
|
||||
|
|
@ -5385,25 +5396,26 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
|
|||
|
||||
[[package]]
|
||||
name = "naga"
|
||||
version = "25.0.1"
|
||||
version = "26.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
|
||||
checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bit-set",
|
||||
"bitflags 2.9.4",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"codespan-reporting",
|
||||
"half",
|
||||
"hashbrown",
|
||||
"hexf-parse",
|
||||
"indexmap",
|
||||
"libm",
|
||||
"log",
|
||||
"num-traits",
|
||||
"once_cell",
|
||||
"rustc-hash 1.1.0",
|
||||
"spirv",
|
||||
"strum",
|
||||
"thiserror 2.0.16",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -5473,7 +5485,7 @@ dependencies = [
|
|||
"bitflags 2.9.4",
|
||||
"jni-sys",
|
||||
"log",
|
||||
"ndk-sys 0.6.0+11769913",
|
||||
"ndk-sys",
|
||||
"num_enum",
|
||||
"raw-window-handle",
|
||||
"thiserror 1.0.69",
|
||||
|
|
@ -5485,15 +5497,6 @@ version = "0.1.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
|
||||
|
||||
[[package]]
|
||||
name = "ndk-sys"
|
||||
version = "0.5.0+25.2.9519653"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
|
||||
dependencies = [
|
||||
"jni-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ndk-sys"
|
||||
version = "0.6.0+11769913"
|
||||
|
|
@ -9399,7 +9402,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
|||
[[package]]
|
||||
name = "vello"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/linebender/vello?rev=5e3e12559781891b204553161aee761900c7e92d#5e3e12559781891b204553161aee761900c7e92d"
|
||||
source = "git+https://github.com/linebender/vello?rev=fdf025a88dd00c546c8fc534697cbf21dac7e12d#fdf025a88dd00c546c8fc534697cbf21dac7e12d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"futures-intrusive",
|
||||
|
|
@ -9417,7 +9420,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vello_common"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/linebender/vello?rev=5e3e12559781891b204553161aee761900c7e92d#5e3e12559781891b204553161aee761900c7e92d"
|
||||
source = "git+https://github.com/linebender/vello?rev=fdf025a88dd00c546c8fc534697cbf21dac7e12d#fdf025a88dd00c546c8fc534697cbf21dac7e12d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"fearless_simd",
|
||||
|
|
@ -9431,7 +9434,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vello_cpu"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/linebender/vello?rev=5e3e12559781891b204553161aee761900c7e92d#5e3e12559781891b204553161aee761900c7e92d"
|
||||
source = "git+https://github.com/linebender/vello?rev=fdf025a88dd00c546c8fc534697cbf21dac7e12d#fdf025a88dd00c546c8fc534697cbf21dac7e12d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"vello_common",
|
||||
|
|
@ -9440,7 +9443,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vello_encoding"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/linebender/vello?rev=5e3e12559781891b204553161aee761900c7e92d#5e3e12559781891b204553161aee761900c7e92d"
|
||||
source = "git+https://github.com/linebender/vello?rev=fdf025a88dd00c546c8fc534697cbf21dac7e12d#fdf025a88dd00c546c8fc534697cbf21dac7e12d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"guillotiere",
|
||||
|
|
@ -9452,7 +9455,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "vello_shaders"
|
||||
version = "0.5.0"
|
||||
source = "git+https://github.com/linebender/vello?rev=5e3e12559781891b204553161aee761900c7e92d#5e3e12559781891b204553161aee761900c7e92d"
|
||||
source = "git+https://github.com/linebender/vello?rev=fdf025a88dd00c546c8fc534697cbf21dac7e12d#fdf025a88dd00c546c8fc534697cbf21dac7e12d"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"log",
|
||||
|
|
@ -9982,12 +9985,13 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
|
|||
|
||||
[[package]]
|
||||
name = "wgpu"
|
||||
version = "25.0.2"
|
||||
version = "26.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec8fb398f119472be4d80bc3647339f56eb63b2a331f6a3d16e25d8144197dd9"
|
||||
checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bitflags 2.9.4",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"document-features",
|
||||
"hashbrown",
|
||||
|
|
@ -10010,9 +10014,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wgpu-core"
|
||||
version = "25.0.1"
|
||||
version = "26.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a19813e647da7aa3cdaa84f5846e2c64114970ea7c86b1e6aae8be08091f4bdc"
|
||||
checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"bit-set",
|
||||
|
|
@ -10042,36 +10046,36 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wgpu-core-deps-apple"
|
||||
version = "25.0.0"
|
||||
version = "26.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cfd488b3239b6b7b185c3b045c39ca6bf8af34467a4c5de4e0b1a564135d093d"
|
||||
checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf"
|
||||
dependencies = [
|
||||
"wgpu-hal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wgpu-core-deps-emscripten"
|
||||
version = "25.0.0"
|
||||
version = "26.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f09ad7aceb3818e52539acc679f049d3475775586f3f4e311c30165cf2c00445"
|
||||
checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d"
|
||||
dependencies = [
|
||||
"wgpu-hal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wgpu-core-deps-windows-linux-android"
|
||||
version = "25.0.0"
|
||||
version = "26.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cba5fb5f7f9c98baa7c889d444f63ace25574833df56f5b817985f641af58e46"
|
||||
checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14"
|
||||
dependencies = [
|
||||
"wgpu-hal",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wgpu-hal"
|
||||
version = "25.0.1"
|
||||
version = "26.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb7c4a1dc42ff14c23c9b11ebf1ee85cde661a9b1cf0392f79c1faca5bc559fb"
|
||||
checksum = "7df2c64ac282a91ad7662c90bc4a77d4a2135bc0b2a2da5a4d4e267afc034b9e"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"arrayvec",
|
||||
|
|
@ -10082,7 +10086,7 @@ dependencies = [
|
|||
"bytemuck",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"core-graphics-types",
|
||||
"core-graphics-types 0.2.0",
|
||||
"glow",
|
||||
"glutin_wgl_sys",
|
||||
"gpu-alloc",
|
||||
|
|
@ -10096,11 +10100,12 @@ dependencies = [
|
|||
"log",
|
||||
"metal",
|
||||
"naga",
|
||||
"ndk-sys 0.5.0+25.2.9519653",
|
||||
"ndk-sys",
|
||||
"objc",
|
||||
"ordered-float 4.6.0",
|
||||
"parking_lot",
|
||||
"portable-atomic",
|
||||
"portable-atomic-util",
|
||||
"profiling",
|
||||
"range-alloc",
|
||||
"raw-window-handle",
|
||||
|
|
@ -10116,9 +10121,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "wgpu-types"
|
||||
version = "25.0.0"
|
||||
version = "26.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2aa49460c2a8ee8edba3fca54325540d904dd85b2e086ada762767e17d06e8bc"
|
||||
checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2"
|
||||
dependencies = [
|
||||
"bitflags 2.9.4",
|
||||
"bytemuck",
|
||||
|
|
|
|||
|
|
@ -168,16 +168,16 @@ unicode-segmentation = "1.12.0"
|
|||
url = "2.5"
|
||||
urlpattern = "0.3"
|
||||
uuid = { version = "1.18.1", features = ["v4", "v5"] }
|
||||
vello = { git = "https://github.com/linebender/vello", rev = "5e3e12559781891b204553161aee761900c7e92d" }
|
||||
vello_cpu = { git = "https://github.com/linebender/vello", rev = "5e3e12559781891b204553161aee761900c7e92d" }
|
||||
vello = { git = "https://github.com/linebender/vello", rev = "fdf025a88dd00c546c8fc534697cbf21dac7e12d" }
|
||||
vello_cpu = { git = "https://github.com/linebender/vello", rev = "fdf025a88dd00c546c8fc534697cbf21dac7e12d" }
|
||||
webdriver = "0.53.0"
|
||||
webgpu_traits = { path = "components/shared/webgpu" }
|
||||
webpki-roots = "1.0"
|
||||
webrender = { git = "https://github.com/servo/webrender", branch = "0.67", features = ["capture"] }
|
||||
webrender_api = { git = "https://github.com/servo/webrender", branch = "0.67" }
|
||||
webxr-api = { path = "components/shared/webxr" }
|
||||
wgpu-core = "25"
|
||||
wgpu-types = "25"
|
||||
wgpu-core = "26"
|
||||
wgpu-types = "26"
|
||||
winapi = "0.3"
|
||||
windows-sys = "0.61"
|
||||
winit = "0.30.12"
|
||||
|
|
|
|||
|
|
@ -197,6 +197,7 @@ impl GPUCommandEncoderMethods<crate::DomTypeHolder> for GPUCommandEncoder {
|
|||
),
|
||||
store_op: color.storeOp.convert(),
|
||||
view: color.view.id().0,
|
||||
depth_slice: None,
|
||||
}))
|
||||
})
|
||||
.collect::<Fallible<Vec<_>>>()?;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
//! Render pass commands
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use wgpu_core::command::{RenderPass, RenderPassError};
|
||||
use wgpu_core::command::{PassStateError, RenderPass};
|
||||
use wgpu_core::global::Global;
|
||||
use wgpu_core::id::{BindGroupId, BufferId, RenderBundleId, RenderPipelineId};
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ pub fn apply_render_command(
|
|||
global: &Global,
|
||||
pass: &mut RenderPass,
|
||||
command: RenderCommand,
|
||||
) -> Result<(), RenderPassError> {
|
||||
) -> Result<(), PassStateError> {
|
||||
match command {
|
||||
RenderCommand::SetPipeline(pipeline_id) => {
|
||||
global.render_pass_set_pipeline(pass, pipeline_id)
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ impl WGPU {
|
|||
source_offset,
|
||||
destination_id,
|
||||
destination_offset,
|
||||
size,
|
||||
Some(size),
|
||||
);
|
||||
self.encoder_record_error(command_encoder_id, &result);
|
||||
},
|
||||
|
|
@ -378,9 +378,7 @@ impl WGPU {
|
|||
if let Some(sender) = sender {
|
||||
let res = match error {
|
||||
// if device is lost we must return pipeline and not raise any error
|
||||
Some(CreateComputePipelineError::Device(
|
||||
DeviceError::Lost | DeviceError::Invalid(_),
|
||||
)) |
|
||||
Some(CreateComputePipelineError::Device(DeviceError::Lost)) |
|
||||
None => Ok(Pipeline {
|
||||
id: compute_pipeline_id,
|
||||
label: descriptor.label.unwrap_or_default().to_string(),
|
||||
|
|
@ -437,9 +435,7 @@ impl WGPU {
|
|||
if let Some(sender) = sender {
|
||||
let res = match error {
|
||||
// if device is lost we must return pipeline and not raise any error
|
||||
Some(CreateRenderPipelineError::Device(
|
||||
DeviceError::Lost | DeviceError::Invalid(_),
|
||||
)) |
|
||||
Some(CreateRenderPipelineError::Device(DeviceError::Lost)) |
|
||||
None => Ok(Pipeline {
|
||||
id: render_pipeline_id,
|
||||
label: descriptor.label.unwrap_or_default().to_string(),
|
||||
|
|
@ -576,7 +572,7 @@ impl WGPU {
|
|||
},
|
||||
WebGPURequest::DestroyBuffer(buffer) => {
|
||||
let global = &self.global;
|
||||
let _result = global.buffer_destroy(buffer);
|
||||
global.buffer_destroy(buffer);
|
||||
},
|
||||
WebGPURequest::DestroyDevice(device) => {
|
||||
let global = &self.global;
|
||||
|
|
@ -586,7 +582,7 @@ impl WGPU {
|
|||
},
|
||||
WebGPURequest::DestroyTexture(texture_id) => {
|
||||
let global = &self.global;
|
||||
let _ = global.texture_destroy(texture_id);
|
||||
global.texture_destroy(texture_id);
|
||||
},
|
||||
WebGPURequest::Exit(sender) => {
|
||||
if let Err(e) = sender.send(()) {
|
||||
|
|
|
|||
|
|
@ -127,9 +127,6 @@ skip = [
|
|||
# wgpu has the latest and greatest.
|
||||
"windows-core",
|
||||
|
||||
# wgpu-hal depends on 0.5.0.
|
||||
"ndk-sys",
|
||||
|
||||
# rust-content-security-policy uses newest base64.
|
||||
"base64",
|
||||
|
||||
|
|
@ -196,6 +193,9 @@ skip = [
|
|||
"cfg-expr",
|
||||
"system-deps",
|
||||
"target-lexicon",
|
||||
|
||||
# duplicated by core-graphics
|
||||
"core-graphics-types",
|
||||
]
|
||||
|
||||
# github.com organizations to allow git sources for
|
||||
|
|
|
|||
209139
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
209139
tests/wpt/webgpu/meta/webgpu/cts.https.html.ini
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -1,2 +0,0 @@
|
|||
[exposed.https.html]
|
||||
expected: ERROR
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[canvas_complex_rgba16float_store.https.html]
|
||||
expected:
|
||||
if os == "linux" and not debug: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[canvas_composite_alpha_rgba16float_opaque_copy.https.html]
|
||||
expected:
|
||||
if os == "linux" and not debug: FAIL
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[canvas_composite_alpha_rgba8unorm_premultiplied_copy.https.html]
|
||||
expected:
|
||||
if os == "linux" and not debug: PASS
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
[canvas_display_after_device_lost.https.html]
|
||||
expected:
|
||||
if os == "linux" and not debug: FAIL
|
||||
if os == "linux" and not debug: [TIMEOUT, FAIL]
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[delay_get_texture.https.html]
|
||||
expected:
|
||||
if os == "linux" and not debug: PASS
|
||||
Loading…
Add table
Add a link
Reference in a new issue