aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/gpu.rs
diff options
context:
space:
mode:
authorZakor Gyula <gyula.zakor@h-lab.eu>2019-12-03 15:32:35 +0100
committerZakor Gyula <gyula.zakor@h-lab.eu>2019-12-06 12:49:56 +0100
commite146e6058a372ad0891098358d5ca28c9596460b (patch)
treecb2ee07b52e81a5e268ed9938344f9f69acf510a /components/script/dom/gpu.rs
parent250184fe60388a001b9cc2146f95ed0bf8b59435 (diff)
downloadservo-e146e6058a372ad0891098358d5ca28c9596460b.tar.gz
servo-e146e6058a372ad0891098358d5ca28c9596460b.zip
Replace wgpu-native with wgpu-core
Diffstat (limited to 'components/script/dom/gpu.rs')
-rw-r--r--components/script/dom/gpu.rs16
1 files changed, 9 insertions, 7 deletions
diff --git a/components/script/dom/gpu.rs b/components/script/dom/gpu.rs
index 4e47620052e..8a3e05f2d79 100644
--- a/components/script/dom/gpu.rs
+++ b/components/script/dom/gpu.rs
@@ -117,11 +117,13 @@ impl GPUMethods for GPU {
let promise = Promise::new_in_current_compartment(&self.global(), comp);
let sender = response_async(&promise, self);
let power_preference = match options.powerPreference {
- Some(GPUPowerPreference::Low_power) => wgpu::PowerPreference::LowPower,
- Some(GPUPowerPreference::High_performance) => wgpu::PowerPreference::HighPerformance,
- None => wgpu::PowerPreference::Default,
+ Some(GPUPowerPreference::Low_power) => wgpu::instance::PowerPreference::LowPower,
+ Some(GPUPowerPreference::High_performance) => {
+ wgpu::instance::PowerPreference::HighPerformance
+ },
+ None => wgpu::instance::PowerPreference::Default,
};
- let id = self.global().as_window().Navigator().create_adapter_id();
+ let ids = self.global().as_window().Navigator().create_adapter_ids();
match self.wgpu_channel() {
Some(channel) => {
@@ -129,8 +131,8 @@ impl GPUMethods for GPU {
.0
.send(WebGPURequest::RequestAdapter(
sender,
- wgpu::RequestAdapterOptions { power_preference },
- id,
+ wgpu::instance::RequestAdapterOptions { power_preference },
+ ids,
))
.unwrap();
},
@@ -146,7 +148,7 @@ impl AsyncWGPUListener for GPU {
WebGPUResponse::RequestAdapter(name, adapter) => {
let adapter = GPUAdapter::new(
&self.global(),
- DOMString::from(name),
+ DOMString::from(format!("{} ({:?})", name, adapter.0.backend())),
Heap::default(),
adapter,
);