render: Ensure that the wgpu device is compatible with the window we're

going to render to

render/wgpu/src/lib.rs

@@ -122,10 +122,12 @@ unsafe impl Zeroable for GPUVertex {}
 
 impl WgpuRenderBackend<SwapChainTarget> {
     pub fn for_window<W: HasRawWindowHandle>(window: &W, size: (u32, u32)) -> Result<Self, Error> {
+        let surface = wgpu::Surface::create(window);
+
         let adapter = block_on(wgpu::Adapter::request(
             &wgpu::RequestAdapterOptions {
                 power_preference: wgpu::PowerPreference::HighPerformance,
-                compatible_surface: None,
+                compatible_surface: Some(&surface),
             },
             wgpu::BackendBit::PRIMARY,
         ))
@@ -138,7 +140,7 @@ impl WgpuRenderBackend<SwapChainTarget> {
             limits: wgpu::Limits::default(),
         }));
 
-        let target = SwapChainTarget::new(window, size, &device);
+        let target = SwapChainTarget::new(surface, size, &device);
         Self::new(Rc::new(device), Rc::new(queue), target)
     }
 }

render/wgpu/src/target.rs

@@ -1,7 +1,6 @@
 use futures::executor::block_on;
 use image::buffer::ConvertBuffer;
 use image::{Bgra, ImageBuffer, RgbaImage};
-use raw_window_handle::HasRawWindowHandle;
 use std::fmt::Debug;
 
 pub trait RenderTargetFrame: Debug {
@@ -46,18 +45,17 @@ impl RenderTargetFrame for SwapChainTargetFrame {
 }
 
 impl SwapChainTarget {
-    pub fn new<W: HasRawWindowHandle>(window: &W, size: (u32, u32), device: &wgpu::Device) -> Self {
-        let window_surface = wgpu::Surface::create(window);
+    pub fn new(surface: wgpu::Surface, size: (u32, u32), device: &wgpu::Device) -> Self {
         let swap_chain_desc = wgpu::SwapChainDescriptor {
             usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
             format: wgpu::TextureFormat::Bgra8Unorm,
             width: size.0,
             height: size.1,
             present_mode: wgpu::PresentMode::Mailbox,
         };
-        let swap_chain = device.create_swap_chain(&window_surface, &swap_chain_desc);
+        let swap_chain = device.create_swap_chain(&surface, &swap_chain_desc);
         Self {
-            window_surface,
+            window_surface: surface,
             swap_chain_desc,
             swap_chain,
         }