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 2 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
72 changes: 55 additions & 17 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 @@ -590,6 +591,10 @@ impl d::Device<B> for Device {

let dependencies = dependencies
.into_iter()
.collect::<Vec<ID::Item>>();
Copy link
Member

Choose a reason for hiding this comment

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

let's use inplace_or_alloc_array instead


let vk_dependencies = dependencies
.iter()
.map(|subpass_dep| {
let sdep = subpass_dep.borrow();
// TODO: checks
Expand Down Expand Up @@ -644,13 +649,13 @@ impl d::Device<B> for Device {
.collect::<Box<[_]>>();
let resolves = subpass.resolves.iter().map(make_ref).collect::<Box<[_]>>();

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

let subpasses = attachment_refs
.iter()
.map(|(colors, depth_stencil, inputs, preserves, resolves)| {
.map(|(colors, depth_stencil, inputs, preserves, resolves, _view_mask)| {
vk::SubpassDescription {
flags: vk::SubpassDescriptionFlags::empty(),
pipeline_bind_point: vk::PipelineBindPoint::GRAPHICS,
Expand All @@ -673,23 +678,56 @@ impl d::Device<B> for Device {
})
.collect::<Box<[_]>>();

let result = inplace_it::inplace_or_alloc_array(dependencies.len(), |uninit_guard| {
let dependencies =
uninit_guard.init_with_iter(dependencies);
let multiview_enabled = self.shared.features.contains(Features::MULTIVIEW);

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_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
};
Limeth marked this conversation as resolved.
Show resolved Hide resolved

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);
}
Limeth marked this conversation as resolved.
Show resolved Hide resolved

self.shared.raw.create_render_pass(&info, None)
self.shared.raw.create_render_pass(&info_builder.build(), None)
});

(clear_attachments_mask, result)
Expand Down
Loading