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 | 4 | ||||
| -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, 22 insertions, 22 deletions
@@ -150,7 +150,7 @@ cosmic-text = "0.12" dark-light = "1.0" futures = "0.3" glam = "0.25" -glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0d7ba1bba4dd71eb88d2cface5ce649db2413cb7" } +glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "09712a70df7431e9a3b1ac1bbd4fb634096cb3b4" } guillotiere = "0.6" half = "2.2" image = { version = "0.24", default-features = false } @@ -183,7 +183,7 @@ wasm-bindgen-futures = "0.4" wasm-timer = "0.2" web-sys = "0.3.69" web-time = "1.1" -wgpu = "22.0" +wgpu = "23.0" 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 84a3e5e2..567ab00b 100644 --- a/examples/custom_shader/src/scene/pipeline.rs +++ b/examples/custom_shader/src/scene/pipeline.rs @@ -241,7 +241,7 @@ impl Pipeline { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[Vertex::desc(), cube::Raw::desc()], compilation_options: wgpu::PipelineCompilationOptions::default(), @@ -261,7 +261,7 @@ impl Pipeline { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState { @@ -493,7 +493,7 @@ impl DepthPipeline { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[], compilation_options: wgpu::PipelineCompilationOptions::default(), @@ -509,7 +509,7 @@ impl DepthPipeline { multisample: wgpu::MultisampleState::default(), fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState::REPLACE), diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs index 15f97e08..7ba551aa 100644 --- a/examples/integration/src/scene.rs +++ b/examples/integration/src/scene.rs @@ -72,13 +72,13 @@ fn build_pipeline( layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: &vs_module, - entry_point: "main", + entry_point: Some("main"), buffers: &[], compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &fs_module, - entry_point: "main", + entry_point: Some("main"), targets: &[Some(wgpu::ColorTargetState { format: texture_format, blend: Some(wgpu::BlendState { diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs index effac8da..0f2c202f 100644 --- a/wgpu/src/color.rs +++ b/wgpu/src/color.rs @@ -108,14 +108,14 @@ pub fn convert( layout: Some(&pipeline_layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[], compilation_options: wgpu::PipelineCompilationOptions::default( ), }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState { diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs index cf83c3f2..caac0813 100644 --- a/wgpu/src/image/mod.rs +++ b/wgpu/src/image/mod.rs @@ -128,7 +128,7 @@ impl Pipeline { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[wgpu::VertexBufferLayout { array_stride: mem::size_of::<Instance>() as u64, step_mode: wgpu::VertexStepMode::Instance, @@ -158,7 +158,7 @@ impl Pipeline { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format, blend: Some(wgpu::BlendState { diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs index 207b0d73..3d4ca4db 100644 --- a/wgpu/src/quad/gradient.rs +++ b/wgpu/src/quad/gradient.rs @@ -124,7 +124,7 @@ impl Pipeline { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "gradient_vs_main", + entry_point: Some("gradient_vs_main"), buffers: &[wgpu::VertexBufferLayout { array_stride: std::mem::size_of::<Gradient>() as u64, @@ -157,7 +157,7 @@ impl Pipeline { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "gradient_fs_main", + entry_point: Some("gradient_fs_main"), targets: &quad::color_target_state(format), compilation_options: wgpu::PipelineCompilationOptions::default(), diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs index 86f118d6..f3e85ce7 100644 --- a/wgpu/src/quad/solid.rs +++ b/wgpu/src/quad/solid.rs @@ -89,7 +89,7 @@ impl Pipeline { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "solid_vs_main", + entry_point: Some("solid_vs_main"), buffers: &[wgpu::VertexBufferLayout { array_stride: std::mem::size_of::<Solid>() as u64, step_mode: wgpu::VertexStepMode::Instance, @@ -119,7 +119,7 @@ impl Pipeline { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "solid_fs_main", + entry_point: Some("solid_fs_main"), targets: &quad::color_target_state(format), compilation_options: wgpu::PipelineCompilationOptions::default(), diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs index fb858c10..b865047e 100644 --- a/wgpu/src/triangle.rs +++ b/wgpu/src/triangle.rs @@ -753,7 +753,7 @@ mod solid { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "solid_vs_main", + entry_point: Some("solid_vs_main"), buffers: &[wgpu::VertexBufferLayout { array_stride: std::mem::size_of::< mesh::SolidVertex2D, @@ -773,7 +773,7 @@ mod solid { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "solid_fs_main", + entry_point: Some("solid_fs_main"), targets: &[Some(triangle::fragment_target(format))], compilation_options: wgpu::PipelineCompilationOptions::default(), @@ -926,7 +926,7 @@ mod gradient { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "gradient_vs_main", + entry_point: Some("gradient_vs_main"), buffers: &[wgpu::VertexBufferLayout { array_stride: std::mem::size_of::< mesh::GradientVertex2D, @@ -955,7 +955,7 @@ mod gradient { }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "gradient_fs_main", + entry_point: Some("gradient_fs_main"), targets: &[Some(triangle::fragment_target(format))], compilation_options: wgpu::PipelineCompilationOptions::default(), diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs index ec06e747..0a5b134f 100644 --- a/wgpu/src/triangle/msaa.rs +++ b/wgpu/src/triangle/msaa.rs @@ -110,14 +110,14 @@ impl Blit { layout: Some(&layout), vertex: wgpu::VertexState { module: &shader, - entry_point: "vs_main", + entry_point: Some("vs_main"), buffers: &[], compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { module: &shader, - entry_point: "fs_main", + entry_point: Some("fs_main"), targets: &[Some(wgpu::ColorTargetState { format, blend: Some( |