Merge pull request #1164 from PolyMeilex/wgpu-update

Update wgpu 0.12

examples/integration_wgpu/src/scene.rs

@@ -93,6 +93,7 @@ fn build_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeline {
                 mask: !0,
                 alpha_to_coverage_enabled: false,
             },
+            multiview: None,
         });
 
     pipeline

graphics/Cargo.toml

@@ -20,7 +20,7 @@ opengl = []
 
 [dependencies]
 glam = "0.10"
-raw-window-handle = "0.3"
+raw-window-handle = "0.4"
 thiserror = "1.0"
 
 [dependencies.bytemuck]

wgpu/Cargo.toml

@@ -27,10 +27,10 @@ default_system_font = ["iced_graphics/font-source"]
 spirv = ["wgpu/spirv"]
 
 [dependencies]
-wgpu = "0.11"
-wgpu_glyph = "0.15"
+wgpu = "0.12"
+wgpu_glyph = "0.16"
 glyph_brush = "0.7"
-raw-window-handle = "0.3"
+raw-window-handle = "0.4"
 log = "0.4"
 guillotiere = "0.6"
 futures = "0.3"

wgpu/src/image.rs

@@ -74,10 +74,9 @@ impl Pipeline {
                     wgpu::BindGroupLayoutEntry {
                         binding: 1,
                         visibility: wgpu::ShaderStages::FRAGMENT,
-                        ty: wgpu::BindingType::Sampler {
-                            comparison: false,
-                            filtering: true,
-                        },
+                        ty: wgpu::BindingType::Sampler(
+                            wgpu::SamplerBindingType::Filtering,
+                        ),
                         count: None,
                     },
                 ],
@@ -205,6 +204,7 @@ impl Pipeline {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
+                multiview: None,
             });
 
         let vertices =

wgpu/src/quad.rs

@@ -128,6 +128,7 @@ impl Pipeline {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
+                multiview: None,
             });
 
         let vertices =

wgpu/src/shader/image.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct Globals {
     transform: mat4x4<f32>;
 };

wgpu/src/shader/quad.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct Globals {
     transform: mat4x4<f32>;
     scale: f32;

wgpu/src/shader/triangle.wgsl

@@ -1,4 +1,3 @@
-[[block]]
 struct Globals {
     transform: mat4x4<f32>;
 };

wgpu/src/triangle.rs

@@ -190,6 +190,7 @@ impl Pipeline {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
+                multiview: None,
             });
 
         Pipeline {

wgpu/src/triangle/msaa.rs

@@ -32,10 +32,9 @@ impl Blit {
                 entries: &[wgpu::BindGroupLayoutEntry {
                     binding: 0,
                     visibility: wgpu::ShaderStages::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        comparison: false,
-                        filtering: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(
+                        wgpu::SamplerBindingType::NonFiltering,
+                    ),
                     count: None,
                 }],
             });
@@ -122,6 +121,7 @@ impl Blit {
                     mask: !0,
                     alpha_to_coverage_enabled: false,
                 },
+                multiview: None,
             });
 
         Blit {