Merge pull request #975 from hannobraun/update

Upgrade dependencies related to wgpu/winit
hannobraun · Aug 22, 2022 · db16116 · db16116
2 parents 5228eab + 454e7c3
commit db16116
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 211 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml
@@ -20,8 +20,8 @@ bytemuck = "1.12.1"
 raw-window-handle = "0.4.3"
 thiserror = "1.0.32"
 tracing = "0.1.35"
-wgpu = "0.12.0"
-wgpu_glyph = "0.16.0"
+wgpu = "0.13.1"
+wgpu_glyph = "0.17.0"
 
 [dependencies.fj-interop]
 version = "0.12.0"
@@ -32,11 +32,11 @@ version = "0.12.0"
 path = "../fj-math"
 
 [dependencies.egui]
-version = "0.18.1"
+version = "0.19.0"
 
 [dependencies.egui-wgpu]
-version = "0.18.0"
+version = "0.19.0"
 features = ["winit"]
 
 [dependencies.egui-winit]
-version = "0.18.0"
+version = "0.19.0"
diff --git a/crates/fj-viewer/src/graphics/drawables.rs b/crates/fj-viewer/src/graphics/drawables.rs
@@ -39,14 +39,14 @@ impl<'r> Drawable<'r> {
         let mut render_pass =
             encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
                 label: None,
-                color_attachments: &[wgpu::RenderPassColorAttachment {
+                color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                     view: color_view,
                     resolve_target: None,
                     ops: wgpu::Operations {
                         load: wgpu::LoadOp::Load,
                         store: true,
                     },
-                }],
+                })],
                 depth_stencil_attachment: Some(
                     wgpu::RenderPassDepthStencilAttachment {
                         view: depth_view,

diff --git a/crates/fj-viewer/src/graphics/pipelines.rs b/crates/fj-viewer/src/graphics/pipelines.rs
@@ -115,13 +115,13 @@ impl Pipeline {
                 fragment: Some(wgpu::FragmentState {
                     module: shader.module,
                     entry_point: shader.frag_entry,
-                    targets: &[wgpu::ColorTargetState {
+                    targets: &[Some(wgpu::ColorTargetState {
                         format: color_format,
                         blend: Some(
                             wgpu::BlendState::PREMULTIPLIED_ALPHA_BLENDING,
                         ),
                         write_mask: wgpu::ColorWrites::ALL,
-                    }],
+                    })],
                 }),
                 multiview: None,
             });

diff --git a/crates/fj-viewer/src/graphics/renderer.rs b/crates/fj-viewer/src/graphics/renderer.rs
@@ -1,5 +1,6 @@
 use std::{io, mem::size_of};
 
+use egui_winit::winit::event_loop::EventLoop;
 use fj_interop::status_report::StatusReport;
 use fj_math::{Aabb, Point};
 use thiserror::Error;
@@ -68,6 +69,7 @@ impl Renderer {
     /// Returns a new `Renderer`.
     pub async fn new(
         screen: &impl Screen<Window = egui_winit::winit::window::Window>,
+        event_loop: &EventLoop<()>,
     ) -> Result<Self, InitError> {
         let instance = wgpu::Instance::new(wgpu::Backends::PRIMARY);
 
@@ -121,7 +123,7 @@ impl Renderer {
         //       Don't ask me how I know.
         //
 
-        let egui_winit_state = egui_winit::State::new(4096, screen.window());
+        let egui_winit_state = egui_winit::State::new(event_loop);
         let egui_context = egui::Context::default();
 
         // This is sound, as `window` is an object to create a surface upon.
@@ -163,7 +165,9 @@ impl Renderer {
             .await?;
 
         let color_format = surface
-            .get_preferred_format(&adapter)
+            .get_supported_formats(&adapter)
+            .get(0)
+            .copied()
             .expect("Error determining preferred color format");
 
         let Size { width, height } = screen.size();
@@ -635,14 +639,14 @@ impl Renderer {
     ) {
         encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
             label: None,
-            color_attachments: &[wgpu::RenderPassColorAttachment {
+            color_attachments: &[Some(wgpu::RenderPassColorAttachment {
                 view,
                 resolve_target: None,
                 ops: wgpu::Operations {
                     load: wgpu::LoadOp::Clear(wgpu::Color::WHITE),
                     store: true,
                 },
-            }],
+            })],
             depth_stencil_attachment: Some(
                 wgpu::RenderPassDepthStencilAttachment {
                     view: &self.depth_view,

diff --git a/crates/fj-viewer/src/graphics/shaders.rs b/crates/fj-viewer/src/graphics/shaders.rs
@@ -5,7 +5,7 @@ pub struct Shaders(wgpu::ShaderModule);
 impl Shaders {
     pub fn new(device: &wgpu::Device) -> Self {
         let module =
-            device.create_shader_module(&wgpu::ShaderModuleDescriptor {
+            device.create_shader_module(wgpu::ShaderModuleDescriptor {
                 label: None,
                 source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!(
                     "shader.wgsl"

diff --git a/crates/fj-window/Cargo.toml b/crates/fj-window/Cargo.toml
@@ -19,7 +19,7 @@ categories = ["encoding", "mathematics", "rendering"]
 futures = "0.3.23"
 thiserror = "1.0.32"
 tracing = "0.1.35"
-winit = "0.26.1"
+winit = "0.27.2"
 
 [dependencies.fj-host]
 version = "0.12.0"

diff --git a/crates/fj-window/src/run.rs b/crates/fj-window/src/run.rs
@@ -41,7 +41,7 @@ pub fn run(
     let mut focus_point = None;
 
     let mut input_handler = input::Handler::default();
-    let mut renderer = block_on(Renderer::new(&window))?;
+    let mut renderer = block_on(Renderer::new(&window, &event_loop))?;
 
     let mut draw_config = DrawConfig::default();