Update wgpu to 0.20

iced-rs · May 9, 2024 · bba2a11 · bba2a11
1 parent acfa97a
commit bba2a11
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -142,7 +142,7 @@ cosmic-text = "0.11"
 dark-light = "1.0"
 futures = "0.3"
 glam = "0.25"
-glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0a688982e914bcd1efe4d30ac0dad0dff3c58b24" }
+glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "883b9170b425e76bd369e35435f011e3a3414b0d" }
 guillotiere = "0.6"
 half = "2.2"
 image = "0.24"
@@ -171,9 +171,9 @@ tracing = "0.1"
 unicode-segmentation = "1.0"
 wasm-bindgen-futures = "0.4"
 wasm-timer = "0.2"
-web-sys = "=0.3.67"
+web-sys = "0.3.67"
 web-time = "1.1"
-wgpu = "0.19"
+wgpu = "0.20"
 winapi = "0.3"
 window_clipboard = "0.4.1"
 winit = { git = "https://github.com/iced-rs/winit.git", rev = "8affa522bc6dcc497d332a28c03491d22a22f5a7" }

diff --git a/examples/custom_shader/src/scene/pipeline.rs b/examples/custom_shader/src/scene/pipeline.rs
@@ -243,6 +243,8 @@ impl Pipeline {
                     module: &shader,
                     entry_point: "vs_main",
                     buffers: &[Vertex::desc(), cube::Raw::desc()],
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                 },
                 primitive: wgpu::PrimitiveState::default(),
                 depth_stencil: Some(wgpu::DepthStencilState {
@@ -276,6 +278,8 @@ impl Pipeline {
                         }),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                 }),
                 multiview: None,
             });
@@ -490,6 +494,8 @@ impl DepthPipeline {
                     module: &shader,
                     entry_point: "vs_main",
                     buffers: &[],
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                 },
                 primitive: wgpu::PrimitiveState::default(),
                 depth_stencil: Some(wgpu::DepthStencilState {
@@ -508,6 +514,8 @@ impl DepthPipeline {
                         blend: Some(wgpu::BlendState::REPLACE),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                 }),
                 multiview: None,
             });

diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
@@ -74,6 +74,7 @@ fn build_pipeline(
             module: &vs_module,
             entry_point: "main",
             buffers: &[],
+            compilation_options: wgpu::PipelineCompilationOptions::default(),
         },
         fragment: Some(wgpu::FragmentState {
             module: &fs_module,
@@ -86,6 +87,7 @@ fn build_pipeline(
                 }),
                 write_mask: wgpu::ColorWrites::ALL,
             })],
+            compilation_options: wgpu::PipelineCompilationOptions::default(),
         }),
         primitive: wgpu::PrimitiveState {
             topology: wgpu::PrimitiveTopology::TriangleList,

diff --git 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
@@ -151,6 +151,8 @@ impl Pipeline {
                             7 => Sint32,
                         ),
                     }],
+                    compilation_options:
+                        wgpu::PipelineCompilationOptions::default(),
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
@@ -171,6 +173,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
@@ -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
@@ -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
@@ -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
@@ -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,