me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update wgpu to 23.0

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-11-05 13:32:14 +01:00
parent 50340b4b43
commit ebc4e17ba8
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
9 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -150,7 +150,7 @@ cosmic-text = "0.12"
dark-light = "1.0" dark-light = "1.0"
futures = "0.3" futures = "0.3"
glam = "0.25" 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" guillotiere = "0.6"
half = "2.2" half = "2.2"
image = { version = "0.24", default-features = false } image = { version = "0.24", default-features = false }
@ -183,7 +183,7 @@ wasm-bindgen-futures = "0.4"
wasm-timer = "0.2" wasm-timer = "0.2"
web-sys = "0.3.69" web-sys = "0.3.69"
web-time = "1.1" web-time = "1.1"
wgpu = "22.0" wgpu = "23.0"
winapi = "0.3" winapi = "0.3"
window_clipboard = "0.4.1" window_clipboard = "0.4.1"
winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" } winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" }

8
examples/custom_shader/src/scene/pipeline.rs
View file

@ -241,7 +241,7 @@ impl Pipeline {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: Some("vs_main"),
buffers: &[Vertex::desc(), cube::Raw::desc()], buffers: &[Vertex::desc(), cube::Raw::desc()],
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),
@ -261,7 +261,7 @@ impl Pipeline {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "fs_main", entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format, format,
blend: Some(wgpu::BlendState { blend: Some(wgpu::BlendState {
@ -493,7 +493,7 @@ impl DepthPipeline {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: Some("vs_main"),
buffers: &[], buffers: &[],
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),
@ -509,7 +509,7 @@ impl DepthPipeline {
multisample: wgpu::MultisampleState::default(), multisample: wgpu::MultisampleState::default(),
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "fs_main", entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format, format,
blend: Some(wgpu::BlendState::REPLACE), blend: Some(wgpu::BlendState::REPLACE),

4
examples/integration/src/scene.rs
View file

@ -72,13 +72,13 @@ fn build_pipeline(
layout: Some(&pipeline_layout), layout: Some(&pipeline_layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &vs_module, module: &vs_module,
entry_point: "main", entry_point: Some("main"),
buffers: &[], buffers: &[],
compilation_options: wgpu::PipelineCompilationOptions::default(), compilation_options: wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &fs_module, module: &fs_module,
entry_point: "main", entry_point: Some("main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format: texture_format, format: texture_format,
blend: Some(wgpu::BlendState { blend: Some(wgpu::BlendState {

4
wgpu/src/color.rs
View file

@ -108,14 +108,14 @@ pub fn convert(
layout: Some(&pipeline_layout), layout: Some(&pipeline_layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: Some("vs_main"),
buffers: &[], buffers: &[],
compilation_options: wgpu::PipelineCompilationOptions::default( compilation_options: wgpu::PipelineCompilationOptions::default(
), ),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "fs_main", entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format, format,
blend: Some(wgpu::BlendState { blend: Some(wgpu::BlendState {

4
wgpu/src/image/mod.rs
View file

@ -128,7 +128,7 @@ impl Pipeline {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: Some("vs_main"),
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: mem::size_of::<Instance>() as u64, array_stride: mem::size_of::<Instance>() as u64,
step_mode: wgpu::VertexStepMode::Instance, step_mode: wgpu::VertexStepMode::Instance,
@ -158,7 +158,7 @@ impl Pipeline {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "fs_main", entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format, format,
blend: Some(wgpu::BlendState { blend: Some(wgpu::BlendState {

4
wgpu/src/quad/gradient.rs
View file

@ -124,7 +124,7 @@ impl Pipeline {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "gradient_vs_main", entry_point: Some("gradient_vs_main"),
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<Gradient>() array_stride: std::mem::size_of::<Gradient>()
as u64, as u64,
@ -157,7 +157,7 @@ impl Pipeline {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "gradient_fs_main", entry_point: Some("gradient_fs_main"),
targets: &quad::color_target_state(format), targets: &quad::color_target_state(format),
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),

4
wgpu/src/quad/solid.rs
View file

@ -89,7 +89,7 @@ impl Pipeline {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "solid_vs_main", entry_point: Some("solid_vs_main"),
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::<Solid>() as u64, array_stride: std::mem::size_of::<Solid>() as u64,
step_mode: wgpu::VertexStepMode::Instance, step_mode: wgpu::VertexStepMode::Instance,
@ -119,7 +119,7 @@ impl Pipeline {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "solid_fs_main", entry_point: Some("solid_fs_main"),
targets: &quad::color_target_state(format), targets: &quad::color_target_state(format),
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),

8
wgpu/src/triangle.rs
View file

@ -753,7 +753,7 @@ mod solid {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "solid_vs_main", entry_point: Some("solid_vs_main"),
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::< array_stride: std::mem::size_of::<
mesh::SolidVertex2D, mesh::SolidVertex2D,
@ -773,7 +773,7 @@ mod solid {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "solid_fs_main", entry_point: Some("solid_fs_main"),
targets: &[Some(triangle::fragment_target(format))], targets: &[Some(triangle::fragment_target(format))],
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),
@ -926,7 +926,7 @@ mod gradient {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "gradient_vs_main", entry_point: Some("gradient_vs_main"),
buffers: &[wgpu::VertexBufferLayout { buffers: &[wgpu::VertexBufferLayout {
array_stride: std::mem::size_of::< array_stride: std::mem::size_of::<
mesh::GradientVertex2D, mesh::GradientVertex2D,
@ -955,7 +955,7 @@ mod gradient {
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "gradient_fs_main", entry_point: Some("gradient_fs_main"),
targets: &[Some(triangle::fragment_target(format))], targets: &[Some(triangle::fragment_target(format))],
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),

4
wgpu/src/triangle/msaa.rs
View file

@ -110,14 +110,14 @@ impl Blit {
layout: Some(&layout), layout: Some(&layout),
vertex: wgpu::VertexState { vertex: wgpu::VertexState {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: Some("vs_main"),
buffers: &[], buffers: &[],
compilation_options: compilation_options:
wgpu::PipelineCompilationOptions::default(), wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "fs_main", entry_point: Some("fs_main"),
targets: &[Some(wgpu::ColorTargetState { targets: &[Some(wgpu::ColorTargetState {
format, format,
blend: Some( blend: Some(