diff options
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | examples/custom_shader/src/scene/pipeline.rs | 8 | ||||
| -rw-r--r-- | examples/integration/src/scene.rs | 2 | ||||
| -rw-r--r-- | wgpu/src/color.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/image/mod.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/quad/gradient.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/quad/solid.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/triangle.rs | 8 | ||||
| -rw-r--r-- | wgpu/src/triangle/msaa.rs | 4 |
9 files changed, 40 insertions, 2 deletions
@@ -148,7 +148,7 @@ cosmic-text = "0.12" dark-light = "1.0" futures = "0.3" glam = "0.25" -glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "feef9f5630c2adb3528937e55f7bfad2da561a65" } +glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "ce412b3954118d2a4ae20de2d6959247d6f7ed76" } guillotiere = "0.6" half = "2.2" image = { version = "0.24", default-features = false } @@ -181,7 +181,7 @@ wasm-bindgen-futures = "0.4" wasm-timer = "0.2" web-sys = "0.3.69" web-time = "1.1" -wgpu = "0.19" +wgpu = "0.20.1" winapi = "0.3" window_clipboard = "0.4.1" winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" } diff --git a/examples/custom_shader/src/scene/pipeline.rs b/examples/custom_shader/src/scene/pipeline.rs index 50b70a98..20ca6a67 100644 --- 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 index e29558bf..f3a7a194 100644 --- 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 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, |