Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Feature multiview #3323

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/colour-uniform/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -686,12 +686,13 @@ impl<B: Backend> RenderPassState<B> {
inputs: &[],
resolves: &[],
preserves: &[],
view_mask: 0,
};

device
.borrow()
.device
.create_render_pass(&[attachment], &[subpass], &[])
.create_render_pass(&[attachment], &[subpass], &[], None)
.ok()
};

Expand Down
3 changes: 2 additions & 1 deletion examples/mesh-shading/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,11 @@ where
inputs: &[],
resolves: &[],
preserves: &[],
view_mask: 0,
};

ManuallyDrop::new(
unsafe { device.create_render_pass(&[attachment], &[subpass], &[]) }
unsafe { device.create_render_pass(&[attachment], &[subpass], &[], None) }
.expect("Can't create render pass"),
)
};
Expand Down
3 changes: 2 additions & 1 deletion examples/quad/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,11 @@ where
inputs: &[],
resolves: &[],
preserves: &[],
view_mask: 0,
};

ManuallyDrop::new(
unsafe { device.create_render_pass(&[attachment], &[subpass], &[]) }
unsafe { device.create_render_pass(&[attachment], &[subpass], &[], None) }
.expect("Can't create render pass"),
)
};
Expand Down
1 change: 1 addition & 0 deletions src/backend/dx11/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@ impl device::Device<Backend> for Device {
attachments: IA,
subpasses: IS,
_dependencies: ID,
_correlation_masks: Option<&[u32]>,
) -> Result<RenderPass, device::OutOfMemory>
where
IA: IntoIterator,
Expand Down
1 change: 1 addition & 0 deletions src/backend/dx12/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,7 @@ impl d::Device<B> for Device {
attachments: IA,
subpasses: IS,
dependencies: ID,
_correlation_masks: Option<&[u32]>,
) -> Result<r::RenderPass, d::OutOfMemory>
where
IA: IntoIterator,
Expand Down
1 change: 1 addition & 0 deletions src/backend/empty/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ impl device::Device<Backend> for Device {
_: IA,
_: IS,
_: ID,
_: Option<&[u32]>,
) -> Result<(), device::OutOfMemory>
where
IA: IntoIterator,
Expand Down
1 change: 1 addition & 0 deletions src/backend/gl/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ impl d::Device<B> for Device {
attachments: IA,
subpasses: IS,
_dependencies: ID,
correlation_masks: Option<&[u32]>,
) -> Result<n::RenderPass, d::OutOfMemory>
where
IA: IntoIterator,
Expand Down
1 change: 1 addition & 0 deletions src/backend/metal/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,7 @@ impl hal::device::Device<Backend> for Device {
attachments: IA,
subpasses: IS,
_dependencies: ID,
_correlation_masks: Option<&[u32]>,
) -> Result<n::RenderPass, OutOfMemory>
where
IA: IntoIterator,
Expand Down
222 changes: 130 additions & 92 deletions src/backend/vulkan/src/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ impl d::Device<B> for Device {
attachments: IA,
subpasses: IS,
dependencies: ID,
correlation_masks: Option<&[u32]>,
) -> Result<n::RenderPass, d::OutOfMemory>
where
IA: IntoIterator,
Expand Down Expand Up @@ -587,109 +588,146 @@ impl d::Device<B> for Device {
final_layout: conv::map_image_layout(attachment.layouts.end),
}
});
let dependencies = dependencies.into_iter();

let dependencies = dependencies
.into_iter()
.map(|subpass_dep| {
let sdep = subpass_dep.borrow();
// TODO: checks
vk::SubpassDependency {
src_subpass: sdep
.passes
.start
.map_or(vk::SUBPASS_EXTERNAL, |id| id as u32),
dst_subpass: sdep.passes.end.map_or(vk::SUBPASS_EXTERNAL, |id| id as u32),
src_stage_mask: conv::map_pipeline_stage(sdep.stages.start),
dst_stage_mask: conv::map_pipeline_stage(sdep.stages.end),
src_access_mask: conv::map_image_access(sdep.accesses.start),
dst_access_mask: conv::map_image_access(sdep.accesses.end),
dependency_flags: mem::transmute(sdep.flags),
}
});
let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard_dependencies| {
let dependencies = uninit_guard_dependencies.init_with_iter(dependencies);
Comment on lines +593 to +594
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard_dependencies| {
let dependencies = uninit_guard_dependencies.init_with_iter(dependencies);
let (clear_attachments_mask, result) =
inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard_dependencies| {
let dependencies = uninit_guard_dependencies.init_with_iter(dependencies);

generated by rustfmt


let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(attachments.len(), |uninit_guard| {
let attachments = uninit_guard.init_with_iter(attachments);

let clear_attachments_mask = attachments
let vk_dependencies = dependencies
.iter()
.enumerate()
.filter_map(|(i, at)| {
if at.load_op == vk::AttachmentLoadOp::CLEAR
|| at.stencil_load_op == vk::AttachmentLoadOp::CLEAR
{
Some(1 << i as u64)
} else {
None
.map(|subpass_dep| {
let sdep = subpass_dep.borrow();
// TODO: checks
vk::SubpassDependency {
src_subpass: sdep
.passes
.start
.map_or(vk::SUBPASS_EXTERNAL, |id| id as u32),
dst_subpass: sdep.passes.end.map_or(vk::SUBPASS_EXTERNAL, |id| id as u32),
src_stage_mask: conv::map_pipeline_stage(sdep.stages.start),
dst_stage_mask: conv::map_pipeline_stage(sdep.stages.end),
src_access_mask: conv::map_image_access(sdep.accesses.start),
dst_access_mask: conv::map_image_access(sdep.accesses.end),
dependency_flags: mem::transmute(sdep.flags),
}
})
.sum();
});

let attachment_refs = subpasses
.into_iter()
.map(|subpass| {
let subpass = subpass.borrow();
fn make_ref(&(id, layout): &pass::AttachmentRef) -> vk::AttachmentReference {
vk::AttachmentReference {
attachment: id as _,
layout: conv::map_image_layout(layout),
}
}
let colors = subpass.colors.iter().map(make_ref).collect::<Box<[_]>>();
let depth_stencil = subpass.depth_stencil.map(make_ref);
let inputs = subpass.inputs.iter().map(make_ref).collect::<Box<[_]>>();
let preserves = subpass
.preserves
.iter()
.map(|&id| id as u32)
.collect::<Box<[_]>>();
let resolves = subpass.resolves.iter().map(make_ref).collect::<Box<[_]>>();

(colors, depth_stencil, inputs, preserves, resolves)
})
.collect::<Box<[_]>>();
let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(attachments.len(), |uninit_guard_attachments| {
let attachments = uninit_guard_attachments.init_with_iter(attachments);
Comment on lines +615 to +616
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(attachments.len(), |uninit_guard_attachments| {
let attachments = uninit_guard_attachments.init_with_iter(attachments);
let (clear_attachments_mask, result) = inplace_it::inplace_or_alloc_array(
attachments.len(),
|uninit_guard_attachments| {
let attachments = uninit_guard_attachments.init_with_iter(attachments);

generated by rustfmt


let subpasses = attachment_refs
.iter()
.map(|(colors, depth_stencil, inputs, preserves, resolves)| {
vk::SubpassDescription {
flags: vk::SubpassDescriptionFlags::empty(),
pipeline_bind_point: vk::PipelineBindPoint::GRAPHICS,
input_attachment_count: inputs.len() as u32,
p_input_attachments: inputs.as_ptr(),
color_attachment_count: colors.len() as u32,
p_color_attachments: colors.as_ptr(),
p_resolve_attachments: if resolves.is_empty() {
ptr::null()
let clear_attachments_mask = attachments
.iter()
.enumerate()
.filter_map(|(i, at)| {
if at.load_op == vk::AttachmentLoadOp::CLEAR
|| at.stencil_load_op == vk::AttachmentLoadOp::CLEAR
{
Some(1 << i as u64)
} else {
resolves.as_ptr()
},
p_depth_stencil_attachment: match depth_stencil {
Some(ref aref) => aref as *const _,
None => ptr::null(),
},
preserve_attachment_count: preserves.len() as u32,
p_preserve_attachments: preserves.as_ptr(),
}
})
.collect::<Box<[_]>>();
None
}
})
.sum();

let attachment_refs = subpasses
.into_iter()
.map(|subpass| {
let subpass = subpass.borrow();
fn make_ref(&(id, layout): &pass::AttachmentRef) -> vk::AttachmentReference {
vk::AttachmentReference {
attachment: id as _,
layout: conv::map_image_layout(layout),
}
}
let colors = subpass.colors.iter().map(make_ref).collect::<Box<[_]>>();
let depth_stencil = subpass.depth_stencil.map(make_ref);
let inputs = subpass.inputs.iter().map(make_ref).collect::<Box<[_]>>();
let preserves = subpass
.preserves
.iter()
.map(|&id| id as u32)
.collect::<Box<[_]>>();
let resolves = subpass.resolves.iter().map(make_ref).collect::<Box<[_]>>();

(colors, depth_stencil, inputs, preserves, resolves, subpass.view_mask)
})
.collect::<Box<[_]>>();

let result = inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard| {
let dependencies =
uninit_guard.init_with_iter(dependencies);
let subpasses = attachment_refs
.iter()
.map(|(colors, depth_stencil, inputs, preserves, resolves, _view_mask)| {
vk::SubpassDescription {
flags: vk::SubpassDescriptionFlags::empty(),
pipeline_bind_point: vk::PipelineBindPoint::GRAPHICS,
input_attachment_count: inputs.len() as u32,
p_input_attachments: inputs.as_ptr(),
color_attachment_count: colors.len() as u32,
p_color_attachments: colors.as_ptr(),
p_resolve_attachments: if resolves.is_empty() {
ptr::null()
} else {
resolves.as_ptr()
},
p_depth_stencil_attachment: match depth_stencil {
Some(ref aref) => aref as *const _,
None => ptr::null(),
},
preserve_attachment_count: preserves.len() as u32,
p_preserve_attachments: preserves.as_ptr(),
}
})
.collect::<Box<[_]>>();

let multiview_enabled = self.shared.features.contains(Features::MULTIVIEW);

let view_masks = if multiview_enabled {
Some(
attachment_refs
.iter()
.map(|(_colors, _depth_stencil, _inputs, _preserves, _resolves, view_mask)| {
*view_mask
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.map(|&id| id as u32)
.collect::<Box<[_]>>();
let resolves = subpass.resolves.iter().map(make_ref).collect::<Box<[_]>>();
(colors, depth_stencil, inputs, preserves, resolves, subpass.view_mask)
})
.collect::<Box<[_]>>();
let result = inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard| {
let dependencies =
uninit_guard.init_with_iter(dependencies);
let subpasses = attachment_refs
.iter()
.map(|(colors, depth_stencil, inputs, preserves, resolves, _view_mask)| {
vk::SubpassDescription {
flags: vk::SubpassDescriptionFlags::empty(),
pipeline_bind_point: vk::PipelineBindPoint::GRAPHICS,
input_attachment_count: inputs.len() as u32,
p_input_attachments: inputs.as_ptr(),
color_attachment_count: colors.len() as u32,
p_color_attachments: colors.as_ptr(),
p_resolve_attachments: if resolves.is_empty() {
ptr::null()
} else {
resolves.as_ptr()
},
p_depth_stencil_attachment: match depth_stencil {
Some(ref aref) => aref as *const _,
None => ptr::null(),
},
preserve_attachment_count: preserves.len() as u32,
p_preserve_attachments: preserves.as_ptr(),
}
})
.collect::<Box<[_]>>();
let multiview_enabled = self.shared.features.contains(Features::MULTIVIEW);
let view_masks = if multiview_enabled {
Some(
attachment_refs
.iter()
.map(|(_colors, _depth_stencil, _inputs, _preserves, _resolves, view_mask)| {
*view_mask
.enumerate()
.filter_map(|(i, at)| {
if at.load_op == vk::AttachmentLoadOp::CLEAR
|| at.stencil_load_op == vk::AttachmentLoadOp::CLEAR
{
Some(1 << i as u64)
} else {
None
}

generated by rustfmt

})
.collect::<Vec<u32>>()
)
} else {
None
};
Comment on lines +690 to +694
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.collect::<Vec<u32>>()
)
} else {
None
};
.sum();
let attachment_refs = subpasses
.into_iter()
.map(|subpass| {
let subpass = subpass.borrow();
fn make_ref(
&(id, layout): &pass::AttachmentRef,
) -> vk::AttachmentReference {
vk::AttachmentReference {
attachment: id as _,
layout: conv::map_image_layout(layout),
}
}
let colors =
subpass.colors.iter().map(make_ref).collect::<Box<[_]>>();
let depth_stencil = subpass.depth_stencil.map(make_ref);
let inputs =
subpass.inputs.iter().map(make_ref).collect::<Box<[_]>>();
let preserves = subpass
.preserves
.iter()
.map(|&id| id as u32)
.collect::<Box<[_]>>();
let resolves =
subpass.resolves.iter().map(make_ref).collect::<Box<[_]>>();
(
colors,
depth_stencil,
inputs,
preserves,
resolves,
subpass.view_mask,
)
})
.collect::<Box<[_]>>();

generated by rustfmt


let info = vk::RenderPassCreateInfo {
s_type: vk::StructureType::RENDER_PASS_CREATE_INFO,
p_next: ptr::null(),
flags: vk::RenderPassCreateFlags::empty(),
attachment_count: attachments.len() as u32,
p_attachments: attachments.as_ptr(),
subpass_count: subpasses.len() as u32,
p_subpasses: subpasses.as_ptr(),
dependency_count: dependencies.len() as u32,
p_dependencies: dependencies.as_ptr(),
let view_offsets = if multiview_enabled {
Some(
dependencies
.iter()
.map(|dependency| dependency.borrow().view_offset)
.collect::<Vec<i32>>(),
)
} else {
None
};

self.shared.raw.create_render_pass(&info, None)
let result = inplace_it::inplace_or_alloc_array(vk_dependencies.len(), |uninit_guard| {
let vk_dependencies = uninit_guard.init_with_iter(vk_dependencies);

let mut info_builder = vk::RenderPassCreateInfo::builder()
.flags(vk::RenderPassCreateFlags::empty())
.attachments(&attachments)
.subpasses(&subpasses)
.dependencies(&vk_dependencies);
let mut multiview;

if multiview_enabled {
multiview = vk::RenderPassMultiviewCreateInfo::builder()
.view_masks(&view_masks.unwrap())
.view_offsets(&view_offsets.unwrap())
.correlation_masks(correlation_masks.unwrap())
.build();

info_builder = info_builder.push_next(&mut multiview);
}
Comment on lines +724 to +725
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
info_builder = info_builder.push_next(&mut multiview);
}
let multiview_enabled = self.shared.features.contains(Features::MULTIVIEW);
let view_masks = if multiview_enabled {
Some(
attachment_refs
.iter()
.map(
|(
_colors,
_depth_stencil,
_inputs,
_preserves,
_resolves,
view_mask,
)| { *view_mask },
)
.collect::<Vec<u32>>(),
)
} else {
None
};
let view_offsets = if multiview_enabled {
Some(
dependencies
.iter()
.map(|dependency| dependency.borrow().view_offset)
.collect::<Vec<i32>>(),
)
} else {
None
};
let result = inplace_it::inplace_or_alloc_array(
vk_dependencies.len(),
|uninit_guard| {
let vk_dependencies = uninit_guard.init_with_iter(vk_dependencies);
let mut info_builder = vk::RenderPassCreateInfo::builder()
.flags(vk::RenderPassCreateFlags::empty())
.attachments(&attachments)
.subpasses(&subpasses)
.dependencies(&vk_dependencies);
let mut multiview;
if multiview_enabled {
multiview = vk::RenderPassMultiviewCreateInfo::builder()
.view_masks(&view_masks.unwrap())
.view_offsets(&view_offsets.unwrap())
.correlation_masks(correlation_masks.unwrap())
.build();
info_builder = info_builder.push_next(&mut multiview);
}
self.shared
.raw
.create_render_pass(&info_builder.build(), None)
},
);

generated by rustfmt


self.shared.raw.create_render_pass(&info_builder.build(), None)
});
Comment on lines +727 to +728
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.shared.raw.create_render_pass(&info_builder.build(), None)
});
(clear_attachments_mask, result)
},
);

generated by rustfmt


(clear_attachments_mask, result)
});

(clear_attachments_mask, result)
Expand Down
Loading