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

Update wgpu to 0.18.1 (#30926)

Browse source 
* Update wgpu to 0.18.1

* Fix webgpu code

* tidy
This commit is contained in:
Samson 2023-12-25 08:11:37 +01:00 • committed by GitHub
parent 3ce590bec4
commit 7973cb6458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 65 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/gpucommandencoder.rs
View file

@ -138,6 +138,7 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
.label
.as_ref()
.map(|l| Cow::Borrowed(&**l)),
timestamp_writes: None,
},
))
};
@ -234,6 +235,8 @@ impl GPUCommandEncoderMethods for GPUCommandEncoder {
.label
.as_ref()
.map(|l| Cow::Borrowed(&**l)),
timestamp_writes: None,
occlusion_query_set: None,
};
Some(wgpu_com::RenderPass::new(self.encoder.0, &desc))
};

10
components/webgpu/Cargo.toml
View file

@ -23,17 +23,17 @@ smallvec = { workspace = true, features = ["serde"] }
webrender = { workspace = true }
webrender_api = { workspace = true }
webrender_traits = { workspace = true }
wgpu-core = { version = "0.17", features = ["replay", "trace", "serial-pass", "wgsl"] }
wgpu-types = { version = "0.17" }
wgpu-core = { workspace = true, features = ["replay", "trace", "serial-pass", "wgsl"] }
wgpu-types = { workspace = true }
[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies.wgpu-core]
version = "0.17"
workspace = true
features = ["replay", "trace", "serial-pass", "metal"]
[target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies.wgpu-core]
version = "0.17"
workspace = true
features = ["replay", "trace", "serial-pass", "vulkan"]
[target.'cfg(windows)'.dependencies.wgpu-core]
version = "0.17"
workspace = true
features = ["replay", "trace", "serial-pass", "dx11", "dx12", "vulkan"]

6
components/webgpu/identity.rs
View file

@ -164,4 +164,8 @@ where
}
}
impl GlobalIdentityHandlerFactory for IdentityRecyclerFactory {}
impl GlobalIdentityHandlerFactory for IdentityRecyclerFactory {
fn ids_are_generated_in_wgpu() -> bool {
false
}
}

1
components/webgpu/lib.rs
View file

@ -377,6 +377,7 @@ impl<'a> WGPU<'a> {
InstanceDescriptor {
backends: wgt::Backends::PRIMARY,
dx12_shader_compiler: Dx12Compiler::default(),
..Default::default()
},
),
adapters: Vec::new(),