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

Update wgpu to 0.20.1

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-05-01 16:19:08 +02:00
parent fed9c8d19b
commit aed9a03e3c
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
9 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -148,7 +148,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 = "feef9f5630c2adb3528937e55f7bfad2da561a65" } glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "ce412b3954118d2a4ae20de2d6959247d6f7ed76" }
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 }
@ -181,7 +181,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 = "0.19" wgpu = "0.20.1"
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

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

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

@ -74,6 +74,7 @@ fn build_pipeline(
module: &vs_module, module: &vs_module,
entry_point: "main", entry_point: "main",
buffers: &[], buffers: &[],
compilation_options: wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &fs_module, module: &fs_module,
@ -86,6 +87,7 @@ fn build_pipeline(
}), }),
write_mask: wgpu::ColorWrites::ALL, write_mask: wgpu::ColorWrites::ALL,
})], })],
compilation_options: wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,

4
wgpu/src/color.rs
View file

@ -110,6 +110,8 @@ pub fn convert(
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: "vs_main",
buffers: &[], buffers: &[],
compilation_options: wgpu::PipelineCompilationOptions::default(
),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
@ -130,6 +132,8 @@ pub fn convert(
}), }),
write_mask: wgpu::ColorWrites::ALL, write_mask: wgpu::ColorWrites::ALL,
})], })],
compilation_options: wgpu::PipelineCompilationOptions::default(
),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,

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

@ -153,6 +153,8 @@ impl Pipeline {
8 => Uint32, 8 => Uint32,
), ),
}], }],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
@ -173,6 +175,8 @@ impl Pipeline {
}), }),
write_mask: wgpu::ColorWrites::ALL, write_mask: wgpu::ColorWrites::ALL,
})], })],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,

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

@ -152,11 +152,15 @@ impl Pipeline {
9 => Float32 9 => Float32
), ),
}], }],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "gradient_fs_main", entry_point: "gradient_fs_main",
targets: &quad::color_target_state(format), targets: &quad::color_target_state(format),
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,

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

@ -114,11 +114,15 @@ impl Pipeline {
8 => Float32, 8 => Float32,
), ),
}], }],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "solid_fs_main", entry_point: "solid_fs_main",
targets: &quad::color_target_state(format), targets: &quad::color_target_state(format),
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,

8
wgpu/src/triangle.rs
View file

@ -760,11 +760,15 @@ mod solid {
1 => Float32x4, 1 => Float32x4,
), ),
}], }],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "solid_fs_main", entry_point: "solid_fs_main",
targets: &[Some(triangle::fragment_target(format))], targets: &[Some(triangle::fragment_target(format))],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: triangle::primitive_state(), primitive: triangle::primitive_state(),
depth_stencil: None, depth_stencil: None,
@ -937,11 +941,15 @@ mod gradient {
6 => Float32x4 6 => Float32x4
), ),
}], }],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
entry_point: "gradient_fs_main", entry_point: "gradient_fs_main",
targets: &[Some(triangle::fragment_target(format))], targets: &[Some(triangle::fragment_target(format))],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: triangle::primitive_state(), primitive: triangle::primitive_state(),
depth_stencil: None, depth_stencil: None,

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

@ -112,6 +112,8 @@ impl Blit {
module: &shader, module: &shader,
entry_point: "vs_main", entry_point: "vs_main",
buffers: &[], buffers: &[],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}, },
fragment: Some(wgpu::FragmentState { fragment: Some(wgpu::FragmentState {
module: &shader, module: &shader,
@ -123,6 +125,8 @@ impl Blit {
), ),
write_mask: wgpu::ColorWrites::ALL, write_mask: wgpu::ColorWrites::ALL,
})], })],
compilation_options:
wgpu::PipelineCompilationOptions::default(),
}), }),
primitive: wgpu::PrimitiveState { primitive: wgpu::PrimitiveState {
topology: wgpu::PrimitiveTopology::TriangleList, topology: wgpu::PrimitiveTopology::TriangleList,