Merge branch 'imbris/metal-panic' into 'master'

Don't include compute in shadow push constant shader stages

Closes #1951

See merge request veloren/veloren!4321
This commit is contained in:
Imbris 2024-02-11 20:03:36 +00:00
commit f159dd5357
2 changed files with 2 additions and 2 deletions

View File

@ -234,7 +234,7 @@ impl PointShadowPipeline {
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
label: Some("Point shadow pipeline layout"),
push_constant_ranges: &[wgpu::PushConstantRange {
stages: wgpu::ShaderStages::all(),
stages: wgpu::ShaderStages::VERTEX_FRAGMENT,
range: 0..64,
}],
bind_group_layouts: &[&global_layout.globals, &terrain_layout.locals],

View File

@ -658,7 +658,7 @@ impl<'frame> Drawer<'frame> {
(0../*20*/1).for_each(|point_light| {
render_pass.set_push_constants(
wgpu::ShaderStages::all(),
wgpu::ShaderStages::VERTEX_FRAGMENT,
0,
&data[(6 * (point_light + 1) * STRIDE + face as usize * STRIDE)
..(6 * (point_light + 1) * STRIDE + (face + 1) as usize * STRIDE)],