WIP: Feature multiview #3323

Limeth · 2020-08-02T15:44:59Z

Once finished, Fixes #3303.
Hopefully the API usage is correct. An example demonstrating the Multiview feature would be desirable. Feedback is appreciated.

PR checklist:

make succeeds (on *nix)
make reftests succeeds
tested examples with the following backends:
rustfmt run on changed code

monocodus

This is an autogenerated code review.New suggestions: 2

src/backend/vulkan/src/device.rs

Co-authored-by: monocodus[bot] <49363530+monocodus[bot]@users.noreply.github.com>

Limeth · 2020-08-02T15:57:19Z

src/backend/vulkan/src/lib.rs

+pub struct PhysicalDeviceMultiviewProperties {
+    pub max_multiview_view_count: u32,
+    pub max_multiview_instance_index: u32,
+}


Substitute for vk::PhysicalDeviceMultiviewProperties without any pointers that would prevent PhysicalDeviceProperties below from being Sync.

kvark

Thank you!
Have a few small concerns about the current state of PR

kvark · 2020-08-02T17:56:25Z

src/backend/vulkan/src/device.rs

@@ -590,6 +591,10 @@ impl d::Device<B> for Device {

        let dependencies = dependencies
            .into_iter()
+            .collect::<Vec<ID::Item>>();


let's use inplace_or_alloc_array instead

kvark · 2020-08-02T17:59:34Z

src/backend/vulkan/src/lib.rs

+}
+
+pub struct PhysicalDeviceProperties {
+    properties: vk::PhysicalDeviceProperties,


the properties.properies look a bit awful :)
maybe this field name should be raw or inner?

kvark · 2020-08-02T18:01:41Z

src/hal/src/lib.rs

+        const MESH_SHADER = 0x0000_0002_0000_0000 << 64;
+
+        /// Supports multiview
+        const MULTIVIEW = 0x0001_0000_0000_0000 << 64;


this should be 0x0000_0004_0000_0000 and so on. No need to leave such a big gap with the mesh shader

kvark · 2020-08-02T18:02:45Z

src/backend/vulkan/src/lib.rs

+            let mut multiview = None;
+
+            // Add extension infos to the p_next chain
+            if supports_extension(extensions, *KHR_MULTIVIEW) {


something is not right here. Why are we checking for this extension in two places?

This check is performed only once during the initialization of PhysicalDevices, I have now replaced the same check within PhysicalDevice::features(): https://github.com/gfx-rs/gfx/pull/3323/files#diff-44198a1b71ecb41e695db8b6967cd689R1028

kvark · 2020-08-02T18:04:06Z

src/backend/vulkan/src/lib.rs

+
+            Self {
+                properties: properties2.properties,
+                multiview: multiview.map(|multiview| multiview.into()),


nit: could write this as muiltiview.map(PhysicalDeviceMultiviewProperties::from)

monocodus

This is an autogenerated code review.New suggestions: 6

monocodus · 2020-08-03T13:35:59Z

src/backend/vulkan/src/device.rs

+        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);


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

monocodus · 2020-08-03T13:35:59Z

src/backend/vulkan/src/device.rs

+            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);


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

monocodus · 2020-08-03T13:36:00Z

src/backend/vulkan/src/device.rs

+                            .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


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

monocodus · 2020-08-03T13:36:00Z

src/backend/vulkan/src/device.rs

+                            .collect::<Vec<u32>>()
+                    )
+                } else {
+                    None
+                };


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

monocodus · 2020-08-03T13:36:00Z

src/backend/vulkan/src/device.rs

+                        info_builder = info_builder.push_next(&mut multiview);
+                    }


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

monocodus · 2020-08-03T13:36:00Z

src/backend/vulkan/src/device.rs

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


Suggested change

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

});

(clear_attachments_mask, result)

},

);

generated by rustfmt

monocodus

This is an autogenerated code review, only first 25 of 30 new suggestions are shown

monocodus · 2020-08-03T16:38:47Z