Upgrade wgpu to 0.15.1 (#250)

* Apply changes for wgpu 0.15 * Add msaa detection * Enable msaa by default * Add simplified diagram * Resolve some unwraps
maplibre · Apr 9, 2023 · bca19c8 · bca19c8
1 parent 28573ce
commit bca19c8
Show file tree

Hide file tree

Showing 14 changed files with 125 additions and 41 deletions.
diff --git a/docs/src/development-documents/architecture.md b/docs/src/development-documents/architecture.md
@@ -10,6 +10,10 @@ A simplified version is shown below:
 
 ![](./figures/render-stack.drawio.svg)
 
+A further simplified version:
+
+![](./figures/simplified-render-stack.drawio.svg)
+
 Notes:
 * wgpu is able to create an interface through which we can reach any device with a GPU.
 

diff --git a/docs/src/development-documents/figures/simplified-render-stack.drawio.svg b/docs/src/development-documents/figures/simplified-render-stack.drawio.svg
diff --git a/maplibre-winit/Cargo.toml b/maplibre-winit/Cargo.toml
@@ -20,8 +20,8 @@ winit = { version = "0.27.2", default-features = false, features = ["x11", "wayl
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3.58", features = ["Window"] }
-wasm-bindgen = "0.2.81"
-wasm-bindgen-futures = "0.4.31"
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4"
 
 [dependencies]
 maplibre = { path = "../maplibre", version = "0.1.0" }

diff --git a/maplibre/Cargo.toml b/maplibre/Cargo.toml
@@ -55,7 +55,8 @@ geozero = { version = "0.9.7", default-features = false, features = ["with-mvt",
 tile-grid = "0.3.0"
 
 # Rendering
-wgpu = "0.14.0"
+wgpu = "0.15.0"
+# wgpu = { git = "https://github.com/gfx-rs/wgpu" }
 lyon = { version = "1.0.0", features = [] }
 raw-window-handle = "0.5.0"
 

diff --git a/maplibre/src/raster/resource_system.rs b/maplibre/src/raster/resource_system.rs
@@ -46,7 +46,7 @@ pub fn resource_system(
                 false,
                 false,
                 false,
-                true,
+                surface.is_multisampling_supported(settings.msaa),
                 true,
             )
             .describe_render_pipeline()

diff --git a/maplibre/src/render/error.rs b/maplibre/src/render/error.rs
@@ -6,6 +6,8 @@ use crate::render::graph::RenderGraphError;
 pub enum RenderError {
     #[error("error in surface")]
     Surface(#[from] wgpu::SurfaceError),
+    #[error("error during surface creation")]
+    CreateSurfaceError(#[from] wgpu::CreateSurfaceError),
     #[error("error in render graph")]
     Graph(#[from] RenderGraphError),
     #[error("error while requesting device")]