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

Update wgpu to 0.17 (#30147)

Browse source
This commit is contained in:
Samson 2023-08-21 09:40:06 +02:00 • committed by GitHub
parent 85a37210c2
commit db2cbff9d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 159 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/webgpu/Cargo.toml
View file

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

2
components/webgpu/identity.rs
View file

@ -7,12 +7,12 @@ use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId;
use serde::{Deserialize, Serialize};
use wgpu::{
hub::{GlobalIdentityHandlerFactory, IdentityHandler, IdentityHandlerFactory},
id::{
AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, ComputePipelineId,
DeviceId, PipelineLayoutId, QuerySetId, RenderBundleId, RenderPipelineId, SamplerId,
ShaderModuleId, StagingBufferId, SurfaceId, TextureId, TextureViewId, TypedId,
},
identity::{GlobalIdentityHandlerFactory, IdentityHandler, IdentityHandlerFactory},
};
use wgt::Backend;

6
components/webgpu/lib.rs
View file

@ -266,7 +266,7 @@ pub enum WebGPURequest {
struct BufferMapInfo<'a, T> {
buffer_id: id::BufferId,
sender: IpcSender<T>,
global: &'a wgpu::hub::Global<IdentityRecyclerFactory>,
global: &'a wgpu::global::Global<IdentityRecyclerFactory>,
size: usize,
external_id: Option<u64>,
}
@ -339,7 +339,7 @@ struct WGPU<'a> {
receiver: IpcReceiver<(Option<ErrorScopeId>, WebGPURequest)>,
sender: IpcSender<(Option<ErrorScopeId>, WebGPURequest)>,
script_sender: IpcSender<WebGPUMsg>,
global: wgpu::hub::Global<IdentityRecyclerFactory>,
global: wgpu::global::Global<IdentityRecyclerFactory>,
adapters: Vec<WebGPUAdapter>,
devices: HashMap<WebGPUDevice, PipelineId>,
// Track invalid adapters https://gpuweb.github.io/gpuweb/#invalid
@ -376,7 +376,7 @@ impl<'a> WGPU<'a> {
receiver,
sender,
script_sender,
global: wgpu::hub::Global::new(
global: wgpu::global::Global::new(
"wgpu-core",
factory,
InstanceDescriptor {