From 23ef0143eda658a82cc45586fb29d1e85b64c6f7 Mon Sep 17 00:00:00 2001 From: Poly Date: Mon, 20 Dec 2021 20:48:28 +0100 Subject: Update wgpu 0.12 --- wgpu/Cargo.toml | 4 ++-- wgpu/src/image.rs | 8 +++----- wgpu/src/quad.rs | 1 + wgpu/src/shader/image.wgsl | 1 - wgpu/src/shader/quad.wgsl | 1 - wgpu/src/shader/triangle.wgsl | 1 - wgpu/src/triangle.rs | 1 + 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; }; 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; 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; }; 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 { -- cgit From d6752693990cf84f8c80d6b38a3866f27446ab0a Mon Sep 17 00:00:00 2001 From: Poly Date: Tue, 21 Dec 2021 20:11:17 +0100 Subject: Update wgpu_glyph --- wgpu/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index a0144f78..bcab0adc 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -28,7 +28,7 @@ spirv = ["wgpu/spirv"] [dependencies] wgpu = "0.12" -wgpu_glyph = {path="../../wgpu_glyph"} +wgpu_glyph = "0.16" glyph_brush = "0.7" raw-window-handle = "0.3" log = "0.4" -- cgit From 8dc7a329649a89bd29735a95457726309084cd75 Mon Sep 17 00:00:00 2001 From: Poly Date: Thu, 23 Dec 2021 23:45:43 +0100 Subject: Bump raw-window-handle --- graphics/Cargo.toml | 2 +- wgpu/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bcab0adc..f4c4fa2c 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -30,7 +30,7 @@ spirv = ["wgpu/spirv"] 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" -- cgit From a7d5bf0d91bfabace21b8347221940399c1e7129 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 4 Jan 2022 16:18:34 +0700 Subject: Fix `integration_wgpu` example --- examples/integration_wgpu/src/scene.rs | 1 + 1 file changed, 1 insertion(+) 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 -- cgit From c19b673583c6d103b2f1f6cd51ba0b4505a5b5f4 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 4 Jan 2022 16:18:51 +0700 Subject: Run `cargo fmt` --- wgpu/src/image.rs | 6 ++++-- wgpu/src/triangle/msaa.rs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs index 60cf1a58..0fefbfaf 100644 --- a/wgpu/src/image.rs +++ b/wgpu/src/image.rs @@ -74,8 +74,10 @@ impl Pipeline { wgpu::BindGroupLayoutEntry { binding: 1, visibility: wgpu::ShaderStages::FRAGMENT, - ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering), - count: None, + ty: wgpu::BindingType::Sampler( + wgpu::SamplerBindingType::Filtering, + ), + count: None, }, ], }); diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index 0614953e..9fb87544 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -32,7 +32,9 @@ impl Blit { entries: &[wgpu::BindGroupLayoutEntry { binding: 0, visibility: wgpu::ShaderStages::FRAGMENT, - ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering), + ty: wgpu::BindingType::Sampler( + wgpu::SamplerBindingType::NonFiltering, + ), count: None, }], }); @@ -119,7 +121,7 @@ impl Blit { mask: !0, alpha_to_coverage_enabled: false, }, - multiview: None + multiview: None, }); Blit { -- cgit