Fix stencil temporarily: gfx-rs/wgpu#3151 (#191)

maplibre · Nov 2, 2022 · e9d4fcc · e9d4fcc
1 parent ecaa696
commit e9d4fcc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/maplibre/Cargo.toml b/maplibre/Cargo.toml
@@ -51,7 +51,10 @@ geozero = { version = "0.9.5", default-features = false, features = ["with-mvt",
 tile-grid = "0.3.0"
 
 # Rendering
-wgpu = "0.14.0"
+wgpu = { git = "https://github.com/Healthire/wgpu.git", rev = "fe5b48c" }
+wgpu-hal = { git = "https://github.com/Healthire/wgpu.git", rev = "fe5b48c" }
+wgpu-types = { git = "https://github.com/Healthire/wgpu.git", rev = "fe5b48c" }
+wgpu-core = { git = "https://github.com/Healthire/wgpu.git", rev = "fe5b48c" }
 lyon = { version = "1.0.0", features = [] }
 raw-window-handle = "0.5.0"
 

diff --git a/maplibre/src/render/mod.rs b/maplibre/src/render/mod.rs
@@ -304,6 +304,9 @@ impl Renderer {
                 max_bind_groups: limits
                     .max_bind_groups
                     .min(constrained_limits.max_bind_groups),
+                max_bindings_per_bind_group: limits
+                    .max_bindings_per_bind_group
+                    .min(constrained_limits.max_bindings_per_bind_group),
                 max_dynamic_uniform_buffers_per_pipeline_layout: limits
                     .max_dynamic_uniform_buffers_per_pipeline_layout
                     .min(constrained_limits.max_dynamic_uniform_buffers_per_pipeline_layout),

diff --git a/maplibre/src/render/settings.rs b/maplibre/src/render/settings.rs
@@ -54,8 +54,6 @@ impl Default for WgpuSettings {
 
         let mut features = Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES;
 
-        features |= Features::DEPTH32FLOAT_STENCIL8;
-
         Self {
             device_label: Default::default(),
             backends,
@@ -133,7 +131,7 @@ impl Default for RendererSettings {
             )))]
             texture_format: TextureFormat::Bgra8UnormSrgb,
 
-            depth_texture_format: TextureFormat::Depth32FloatStencil8,
+            depth_texture_format: TextureFormat::Depth24PlusStencil8,
         }
     }
 }