From c115aed4cc0ba91a8c53356a06cd33141b292ce9 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <dmalyshau@mozilla.com>
Date: Tue, 13 Oct 2020 16:47:23 -0400
Subject: [PATCH] [rs] Update wgpu with another bind group fix, updated power
 preference

---
 wgpu/Cargo.toml                      | 4 ++--
 wgpu/examples/capture/main.rs        | 5 +----
 wgpu/examples/framework.rs           | 2 +-
 wgpu/examples/hello-compute/main.rs  | 5 +----
 wgpu/examples/hello-triangle/main.rs | 2 +-
 wgpu/examples/hello-windows/main.rs  | 2 +-
 wgpu/examples/hello/main.rs          | 5 +----
 wgpu/src/backend/web.rs              | 4 +---
 8 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 9262741d7b..a341ad5c87 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
 package = "wgpu-core"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "44a41dc9a4eac8ddc37675f0d52486ded27bdbb3"
+rev = "7ac706f0a9d90ebdcffeae48e3c530b9921bff2c"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "44a41dc9a4eac8ddc37675f0d52486ded27bdbb3"
+rev = "7ac706f0a9d90ebdcffeae48e3c530b9921bff2c"
 
 [dependencies]
 arrayvec = "0.5"
diff --git a/wgpu/examples/capture/main.rs b/wgpu/examples/capture/main.rs
index 28101c5a13..7425833e13 100644
--- a/wgpu/examples/capture/main.rs
+++ b/wgpu/examples/capture/main.rs
@@ -29,10 +29,7 @@ async fn create_red_image_with_dimensions(
     height: usize,
 ) -> (Device, Buffer, BufferDimensions) {
     let adapter = wgpu::Instance::new(wgpu::BackendBit::PRIMARY)
-        .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
-            compatible_surface: None,
-        })
+        .request_adapter(&wgpu::RequestAdapterOptions::default())
         .await
         .unwrap();
 
diff --git a/wgpu/examples/framework.rs b/wgpu/examples/framework.rs
index dcb3c77a0b..a849b755aa 100644
--- a/wgpu/examples/framework.rs
+++ b/wgpu/examples/framework.rs
@@ -129,7 +129,7 @@ async fn setup<E: Example>(title: &str) -> Setup {
     };
     let adapter = instance
         .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
+            power_preference: wgpu::PowerPreference::default(),
             compatible_surface: Some(&surface),
         })
         .await
diff --git a/wgpu/examples/hello-compute/main.rs b/wgpu/examples/hello-compute/main.rs
index ddd8a64995..3103a6c138 100644
--- a/wgpu/examples/hello-compute/main.rs
+++ b/wgpu/examples/hello-compute/main.rs
@@ -26,10 +26,7 @@ async fn execute_gpu(numbers: Vec<u32>) -> Vec<u32> {
 
     // `request_adapter` instantiates the general connection to the GPU
     let adapter = instance
-        .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
-            compatible_surface: None,
-        })
+        .request_adapter(&wgpu::RequestAdapterOptions::default())
         .await
         .unwrap();
 
diff --git a/wgpu/examples/hello-triangle/main.rs b/wgpu/examples/hello-triangle/main.rs
index c539a3c349..e5b98551a6 100644
--- a/wgpu/examples/hello-triangle/main.rs
+++ b/wgpu/examples/hello-triangle/main.rs
@@ -10,7 +10,7 @@ async fn run(event_loop: EventLoop<()>, window: Window, swapchain_format: wgpu::
     let surface = unsafe { instance.create_surface(&window) };
     let adapter = instance
         .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
+            power_preference: wgpu::PowerPreference::default(),
             // Request an adapter which can render to our surface
             compatible_surface: Some(&surface),
         })
diff --git a/wgpu/examples/hello-windows/main.rs b/wgpu/examples/hello-windows/main.rs
index 731dcdf8d5..d0f7785cb2 100644
--- a/wgpu/examples/hello-windows/main.rs
+++ b/wgpu/examples/hello-windows/main.rs
@@ -74,7 +74,7 @@ async fn run(
         .collect();
     let adapter = instance
         .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
+            power_preference: wgpu::PowerPreference::default(),
             // Request an adapter which can render to our surface
             compatible_surface: viewports.first().map(|desc| &desc.surface),
         })
diff --git a/wgpu/examples/hello/main.rs b/wgpu/examples/hello/main.rs
index 5d90a87214..faeee7520f 100644
--- a/wgpu/examples/hello/main.rs
+++ b/wgpu/examples/hello/main.rs
@@ -2,10 +2,7 @@
 async fn run() {
     #[cfg_attr(target_arch = "wasm32", allow(unused_variables))]
     let adapter = wgpu::Instance::new(wgpu::BackendBit::PRIMARY)
-        .request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::Default,
-            compatible_surface: None,
-        })
+        .request_adapter(&wgpu::RequestAdapterOptions::default())
         .await
         .unwrap();
 
diff --git a/wgpu/src/backend/web.rs b/wgpu/src/backend/web.rs
index d0dce39506..640ff16b3f 100644
--- a/wgpu/src/backend/web.rs
+++ b/wgpu/src/backend/web.rs
@@ -791,9 +791,7 @@ impl crate::Context for Context {
         let mut mapped_options = web_sys::GpuRequestAdapterOptions::new();
         let mapped_power_preference = match options.power_preference {
             wgt::PowerPreference::LowPower => web_sys::GpuPowerPreference::LowPower,
-            wgt::PowerPreference::HighPerformance | wgt::PowerPreference::Default => {
-                web_sys::GpuPowerPreference::HighPerformance
-            }
+            wgt::PowerPreference::HighPerformance => web_sys::GpuPowerPreference::HighPerformance,
         };
         mapped_options.power_preference(mapped_power_preference);
         let adapter_promise = self.0.request_adapter_with_options(&mapped_options);