aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/gpuadapter.rs
diff options
context:
space:
mode:
authorSamson <16504129+sagudev@users.noreply.github.com>2024-09-21 06:20:18 +0200
committerGitHub <noreply@github.com>2024-09-21 04:20:18 +0000
commit24ad2a05268ebc21b5ad127dac28d1e6f880512c (patch)
treee8338c9b9f0876f5896cc6ea13540a9c6edac6f5 /components/script/dom/gpuadapter.rs
parent28d28d0a0a9c9ee2acf45593b9e6c0288857f0a9 (diff)
downloadservo-24ad2a05268ebc21b5ad127dac28d1e6f880512c.tar.gz
servo-24ad2a05268ebc21b5ad127dac28d1e6f880512c.zip
chore: Update wgpu (#33506)
* Update wgpu Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * use all backends at runtime Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * clean up some adapter stuff Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * Update expectations Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> * flakes Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --------- Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
Diffstat (limited to 'components/script/dom/gpuadapter.rs')
-rw-r--r--components/script/dom/gpuadapter.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/components/script/dom/gpuadapter.rs b/components/script/dom/gpuadapter.rs
index 14743dad91f..ff43baab82c 100644
--- a/components/script/dom/gpuadapter.rs
+++ b/components/script/dom/gpuadapter.rs
@@ -140,14 +140,8 @@ impl GPUAdapterMethods for GPUAdapter {
label: Some(descriptor.parent.label.to_string()),
memory_hints: MemoryHints::MemoryUsage,
};
- let device_id = self
- .global()
- .wgpu_id_hub()
- .create_device_id(self.adapter.0.backend());
- let queue_id = self
- .global()
- .wgpu_id_hub()
- .create_queue_id(self.adapter.0.backend());
+ let device_id = self.global().wgpu_id_hub().create_device_id();
+ let queue_id = self.global().wgpu_id_hub().create_queue_id();
let pipeline_id = self.global().pipeline_id();
if self
.channel
@@ -222,11 +216,9 @@ impl AsyncWGPUListener for GPUAdapter {
RequestDeviceError::UnsupportedFeature(f).to_string(),
))
},
- WebGPUResponse::Device((
- _,
- _,
- Err(RequestDeviceError::LimitsExceeded(_) | RequestDeviceError::InvalidAdapter),
- )) => promise.reject_error(Error::Operation),
+ WebGPUResponse::Device((_, _, Err(RequestDeviceError::LimitsExceeded(_)))) => {
+ promise.reject_error(Error::Operation)
+ },
WebGPUResponse::Device((device_id, queue_id, Err(e))) => {
let device = GPUDevice::new(
&self.global(),