diff options
| author | Samson <16504129+sagudev@users.noreply.github.com> | 2023-08-21 09:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-21 07:40:06 +0000 |
| commit | db2cbff9d6ff988c07992dd54cba12ef9f608d69 (patch) | |
| tree | 9af6a394e1169cce9619ea7e56553d8fef0a1967 /components/webgpu | |
| parent | 85a37210c2651b3c0c5dbfc549e31df042174f4d (diff) | |
| download | servo-db2cbff9d6ff988c07992dd54cba12ef9f608d69.tar.gz servo-db2cbff9d6ff988c07992dd54cba12ef9f608d69.zip | |
Update wgpu to 0.17 (#30147)
Diffstat (limited to 'components/webgpu')
| -rw-r--r-- | components/webgpu/Cargo.toml | 10 | ||||
| -rw-r--r-- | components/webgpu/identity.rs | 2 | ||||
| -rw-r--r-- | components/webgpu/lib.rs | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml index 199bde2d5d2..a0494808b2e 100644 --- a/components/webgpu/Cargo.toml +++ b/components/webgpu/Cargo.toml @@ -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"] diff --git a/components/webgpu/identity.rs b/components/webgpu/identity.rs index eb04017911e..e6a9e66cabe 100644 --- a/components/webgpu/identity.rs +++ b/components/webgpu/identity.rs @@ -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; diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs index 2ecc3779aa1..0eb10a0db77 100644 --- a/components/webgpu/lib.rs +++ b/components/webgpu/lib.rs @@ -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 { |