diff options
| -rw-r--r-- | examples/integration_wgpu/src/scene.rs | 1 | ||||
| -rw-r--r-- | graphics/Cargo.toml | 2 | ||||
| -rw-r--r-- | wgpu/Cargo.toml | 6 | ||||
| -rw-r--r-- | wgpu/src/image.rs | 8 | ||||
| -rw-r--r-- | wgpu/src/quad.rs | 1 | ||||
| -rw-r--r-- | wgpu/src/shader/image.wgsl | 1 | ||||
| -rw-r--r-- | wgpu/src/shader/quad.wgsl | 1 | ||||
| -rw-r--r-- | wgpu/src/shader/triangle.wgsl | 1 | ||||
| -rw-r--r-- | wgpu/src/triangle.rs | 1 | ||||
| -rw-r--r-- | wgpu/src/triangle/msaa.rs | 8 |
10 files changed, 15 insertions, 15 deletions
diff --git a/examples/integration_wgpu/src/scene.rs b/examples/integration_wgpu/src/scene.rs index 0b2b1fcd..910d8d8c 100644 --- a/examples/integration_wgpu/src/scene.rs +++ b/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 diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml index 15aac4ed..12f38cce 100644 --- a/graphics/Cargo.toml +++ b/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] diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 744446fd..f4c4fa2c 100644 --- a/wgpu/Cargo.toml +++ b/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" diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index a59dc04b..0fefbfaf 100644 --- a/wgpu/src/image.rs +++ b/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 = diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs index 148d0f6a..22f3b815 100644 --- a/wgpu/src/quad.rs +++ b/wgpu/src/quad.rs @@ -128,6 +128,7 @@ impl Pipeline { mask: !0, alpha_to_coverage_enabled: false, }, + multiview: None, }); let vertices = diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl index a63ee8f6..ff304422 100644 --- a/wgpu/src/shader/image.wgsl +++ b/wgpu/src/shader/image.wgsl @@ -1,4 +1,3 @@ -[[block]] struct Globals { transform: mat4x4<f32>; }; diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl index 80d733ab..73f5d597 100644 --- a/wgpu/src/shader/quad.wgsl +++ b/wgpu/src/shader/quad.wgsl @@ -1,4 +1,3 @@ -[[block]] struct Globals { transform: mat4x4<f32>; scale: f32; diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl index 96eaabcc..61d9c5a4 100644 --- a/wgpu/src/shader/triangle.wgsl +++ b/wgpu/src/shader/triangle.wgsl @@ -1,4 +1,3 @@ -[[block]] struct Globals { transform: mat4x4<f32>; }; diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index 2aaebe58..c702243b 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -190,6 +190,7 @@ impl Pipeline { mask: !0, alpha_to_coverage_enabled: false, }, + multiview: None, }); Pipeline { diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index 070d2d93..9fb87544 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/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 { |