From ebc4e17ba853616326bd3957e75c3e8053b96513 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 5 Nov 2024 13:32:14 +0100 Subject: Update `wgpu` to `23.0` --- 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, 14 insertions(+), 14 deletions(-) (limited to 'wgpu') 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::() 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::() 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::() 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( -- cgit