From a90747dfeb6faa06cc8351f6f90597e9b15c50cd Mon Sep 17 00:00:00 2001
From: 4bb4 <67376761+4bb4@users.noreply.github.com>
Date: Sun, 25 Apr 2021 20:21:50 +0200
Subject: [PATCH] Moved wgpu demo code closer to regular wgpu demo.

This was done in the hopes of fixing the "Invalid ScissorRect
parameters" problem, but it has not helped so far.
---
 .../implot-wgpu-demo/src/support/mod.rs       | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/implot-examples/implot-wgpu-demo/src/support/mod.rs b/implot-examples/implot-wgpu-demo/src/support/mod.rs
index 3cb1b51..a7460ef 100644
--- a/implot-examples/implot-wgpu-demo/src/support/mod.rs
+++ b/implot-examples/implot-wgpu-demo/src/support/mod.rs
@@ -50,22 +50,15 @@ pub fn init(title: &str) -> System {
     }))
     .unwrap();
 
-    let (device, queue) = block_on(adapter.request_device(
-        &wgpu::DeviceDescriptor {
-            features: wgpu::Features::empty(),
-            limits: wgpu::Limits::default(),
-            label: None,
-        },
-        None,
-    ))
-    .unwrap();
+    let (device, queue) =
+        block_on(adapter.request_device(&wgpu::DeviceDescriptor::default(), None)).unwrap();
 
     // Set up swap chain
     let sc_desc = wgpu::SwapChainDescriptor {
         usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
         format: wgpu::TextureFormat::Bgra8UnormSrgb,
-        width: size.width,
-        height: size.height,
+        width: size.width as u32,
+        height: size.height as u32,
         present_mode: wgpu::PresentMode::Mailbox,
     };
 
@@ -154,12 +147,14 @@ impl System {
                     let _hidpi_factor = scale_factor;
                 }
                 Event::WindowEvent {
-                    event: WindowEvent::Resized(size),
+                    event: WindowEvent::Resized(_),
                     ..
                 } => {
+                    let size = window.inner_size();
+
                     // Recreate the swap chain with the new size
-                    sc_desc.width = size.width;
-                    sc_desc.height = size.height;
+                    sc_desc.width = size.width as u32;
+                    sc_desc.height = size.height as u32;
                     swap_chain = device.create_swap_chain(&surface, &sc_desc);
                 }
                 Event::WindowEvent {
@@ -202,6 +197,7 @@ impl System {
                     }
 
                     let mut rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                        label: None,
                         color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
                             attachment: &frame.output.view,
                             resolve_target: None,
@@ -217,14 +213,13 @@ impl System {
                             },
                         }],
                         depth_stencil_attachment: None,
-                        label: None,
                     });
 
                     renderer
                         .render(ui.render(), &queue, &device, &mut rpass)
                         .expect("Rendering failed");
 
-                    drop(rpass); // renders to screen on drop, will probaly be changed in wgpu 0.7 or later
+                    drop(rpass);
 
                     queue.submit(Some(encoder.finish()));
                 }