diff options
| author |  Poly <marynczakbartlomiej@gmail.com> | 2021-12-20 20:48:28 +0100 |
|---|---|---|
| committer |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-01-04 16:15:44 +0700 |
| commit | 23ef0143eda658a82cc45586fb29d1e85b64c6f7 (patch) | |
| tree | 1fd33e45f57c6cc8eda71c1f3c612a598d910952 /wgpu | |
| parent | 332b4b78421d48d380d9491847d7510ce92881f9 (diff) | |
| download | iced-23ef0143eda658a82cc45586fb29d1e85b64c6f7.tar.gz iced-23ef0143eda658a82cc45586fb29d1e85b64c6f7.tar.bz2 iced-23ef0143eda658a82cc45586fb29d1e85b64c6f7.zip | |
Update wgpu 0.12
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/Cargo.toml | 4 | ||||
| -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 | 6 |
8 files changed, 9 insertions, 14 deletions
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 744446fd..a0144f78 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -27,8 +27,8 @@ default_system_font = ["iced_graphics/font-source"] spirv = ["wgpu/spirv"] [dependencies] -wgpu = "0.11" -wgpu_glyph = "0.15" +wgpu = "0.12" +wgpu_glyph = {path="../../wgpu_glyph"} glyph_brush = "0.7" raw-window-handle = "0.3" log = "0.4" diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index a59dc04b..60cf1a58 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -74,11 +74,8 @@ impl Pipeline { wgpu::BindGroupLayoutEntry { binding: 1, visibility: wgpu::ShaderStages::FRAGMENT, - ty: wgpu::BindingType::Sampler { - comparison: false, - filtering: true, - }, - count: None, + ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering), + count: None, }, ], }); @@ -205,6 +202,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..0614953e 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -32,10 +32,7 @@ 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 +119,7 @@ impl Blit { mask: !0, alpha_to_coverage_enabled: false, }, + multiview: None }); Blit { |