From aed9a03e3cc30c68488f6e177e2ea0513e7ffc99 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 1 May 2024 16:19:08 +0200 Subject: Update `wgpu` to `0.20.1` --- wgpu/src/color.rs | 4 ++++ wgpu/src/image/mod.rs | 4 ++++ wgpu/src/quad/gradient.rs | 4 ++++ wgpu/src/quad/solid.rs | 4 ++++ wgpu/src/triangle.rs | 8 ++++++++ wgpu/src/triangle/msaa.rs | 4 ++++ 6 files changed, 28 insertions(+) (limited to 'wgpu/src') diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs index 9d593d9c..f5c4af30 100644 --- a/wgpu/src/color.rs +++ b/wgpu/src/color.rs @@ -110,6 +110,8 @@ pub fn convert( module: &shader, entry_point: "vs_main", buffers: &[], + compilation_options: wgpu::PipelineCompilationOptions::default( + ), }, fragment: Some(wgpu::FragmentState { module: &shader, @@ -130,6 +132,8 @@ pub fn convert( }), write_mask: wgpu::ColorWrites::ALL, })], + compilation_options: wgpu::PipelineCompilationOptions::default( + ), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::TriangleList, diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs index 1b16022a..d72303ea 100644 --- a/wgpu/src/image/mod.rs +++ b/wgpu/src/image/mod.rs @@ -153,6 +153,8 @@ impl Pipeline { 8 => Uint32, ), }], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, @@ -173,6 +175,8 @@ impl Pipeline { }), write_mask: wgpu::ColorWrites::ALL, })], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::TriangleList, diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs index 13dc10f8..b915a6b7 100644 --- a/wgpu/src/quad/gradient.rs +++ b/wgpu/src/quad/gradient.rs @@ -152,11 +152,15 @@ impl Pipeline { 9 => Float32 ), }], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "gradient_fs_main", targets: &quad::color_target_state(format), + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::TriangleList, diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs index 45039a2d..060ef881 100644 --- a/wgpu/src/quad/solid.rs +++ b/wgpu/src/quad/solid.rs @@ -114,11 +114,15 @@ impl Pipeline { 8 => Float32, ), }], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "solid_fs_main", targets: &quad::color_target_state(format), + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::TriangleList, diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index b0551f55..0a2a2174 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -760,11 +760,15 @@ mod solid { 1 => Float32x4, ), }], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "solid_fs_main", targets: &[Some(triangle::fragment_target(format))], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: triangle::primitive_state(), depth_stencil: None, @@ -937,11 +941,15 @@ mod gradient { 6 => Float32x4 ), }], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, entry_point: "gradient_fs_main", targets: &[Some(triangle::fragment_target(format))], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: triangle::primitive_state(), depth_stencil: None, diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index 71c16925..1f230b71 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -112,6 +112,8 @@ impl Blit { module: &shader, entry_point: "vs_main", buffers: &[], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, @@ -123,6 +125,8 @@ impl Blit { ), write_mask: wgpu::ColorWrites::ALL, })], + compilation_options: + wgpu::PipelineCompilationOptions::default(), }), primitive: wgpu::PrimitiveState { topology: wgpu::PrimitiveTopology::TriangleList, -- cgit From a5e69cfb5f7856e4d139ef58e5d022b9d408b542 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 19 Jul 2024 19:10:23 +0200 Subject: Update `wgpu` to `22.0` --- wgpu/src/color.rs | 1 + wgpu/src/image/mod.rs | 1 + wgpu/src/quad/gradient.rs | 1 + wgpu/src/quad/solid.rs | 1 + wgpu/src/triangle.rs | 2 ++ wgpu/src/triangle/msaa.rs | 1 + wgpu/src/window/compositor.rs | 1 + 7 files changed, 8 insertions(+) (limited to 'wgpu/src') diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs index f5c4af30..effac8da 100644 --- a/wgpu/src/color.rs +++ b/wgpu/src/color.rs @@ -143,6 +143,7 @@ pub fn convert( depth_stencil: None, multisample: wgpu::MultisampleState::default(), multiview: None, + cache: None, }); let texture = device.create_texture(&wgpu::TextureDescriptor { diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs index d72303ea..cf83c3f2 100644 --- a/wgpu/src/image/mod.rs +++ b/wgpu/src/image/mod.rs @@ -190,6 +190,7 @@ impl Pipeline { alpha_to_coverage_enabled: false, }, multiview: None, + cache: None, }); Pipeline { diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs index b915a6b7..207b0d73 100644 --- a/wgpu/src/quad/gradient.rs +++ b/wgpu/src/quad/gradient.rs @@ -174,6 +174,7 @@ impl Pipeline { alpha_to_coverage_enabled: false, }, multiview: None, + cache: None, }, ); diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs index 060ef881..86f118d6 100644 --- a/wgpu/src/quad/solid.rs +++ b/wgpu/src/quad/solid.rs @@ -136,6 +136,7 @@ impl Pipeline { alpha_to_coverage_enabled: false, }, multiview: None, + cache: None, }); Self { pipeline } diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index 0a2a2174..3d0869e7 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -774,6 +774,7 @@ mod solid { depth_stencil: None, multisample: triangle::multisample_state(antialiasing), multiview: None, + cache: None, }, ); @@ -955,6 +956,7 @@ mod gradient { depth_stencil: None, multisample: triangle::multisample_state(antialiasing), multiview: None, + cache: None, }, ); diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index 1f230b71..ec06e747 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -140,6 +140,7 @@ impl Blit { alpha_to_coverage_enabled: false, }, multiview: None, + cache: None, }); Blit { diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index 2e938c77..0cfd49b7 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -162,6 +162,7 @@ impl Compositor { ), required_features: wgpu::Features::empty(), required_limits: required_limits.clone(), + memory_hints: wgpu::MemoryHints::MemoryUsage, }, None, ) -- cgit From 84b658dbef0b29c57f67e041a1496c699ce78615 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 20 Sep 2024 00:39:21 +0200 Subject: Introduce `strict-assertions` feature flag For now, this feature flag only enables validation in `iced_wgpu`; which has become quite expensive since its `0.20` release. --- wgpu/src/window/compositor.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'wgpu/src') diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index 0cfd49b7..56f33b50 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -56,6 +56,11 @@ impl Compositor { ) -> Result { let instance = wgpu::Instance::new(wgpu::InstanceDescriptor { backends: settings.backends, + flags: if cfg!(feature = "strict-assertions") { + wgpu::InstanceFlags::debugging() + } else { + wgpu::InstanceFlags::empty() + }, ..Default::default() }); -- cgit