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.

Sign up for GitHub

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

Jump to bottom

examples: Fix sync validation errors #941

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

examples: Fix sync validation errors #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f579cf
Fix sync validation errors
koplas Sep 17, 2024
d01dea0
Mark record_submit_commandbuffer as unsafe
koplas Sep 21, 2024
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
4 changes: 2 additions & 2 deletions ash-examples/src/bin/texture.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ fn main() -> Result<(), Box<dyn Error>> {
record_submit_commandbuffer(
&base.device,
base.setup_command_buffer,
base.setup_commands_reuse_fence,
base.submit_complete_fence,
base.present_queue,
&[],
&[],
Expand Down Expand Up @@ -721,7 +721,7 @@ fn main() -> Result<(), Box<dyn Error>> {
record_submit_commandbuffer(
&base.device,
base.draw_command_buffer,
base.draw_commands_reuse_fence,
base.submit_complete_fence,
base.present_queue,
&[vk::PipelineStageFlags::BOTTOM_OF_PIPE],
&[base.present_complete_semaphore],
Expand Down
2 changes: 1 addition & 1 deletion ash-examples/src/bin/triangle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ fn main() -> Result<(), Box<dyn Error>> {
record_submit_commandbuffer(
&base.device,
base.draw_command_buffer,
base.draw_commands_reuse_fence,
base.submit_complete_fence,
base.present_queue,
&[vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT],
&[base.present_complete_semaphore],
Expand Down
114 changes: 57 additions & 57 deletions ash-examples/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@ macro_rules! offset_of {
}
}};
}
/// Helper function for submitting command buffers. Immediately waits for the fence before the command buffer
/// is executed. That way we can delay the waiting for the fences by 1 frame which is good for performance.
/// Make sure to create the fence in a signaled state on the first use.
/// Helper function for submitting command buffers.
///
/// # Safety
///
/// The caller must ensure that the command buffer and the fence is
/// not currently used. The wait_mask must specify capabilities that
/// are supported by the queue.
#[allow(clippy::too_many_arguments)]
pub fn record_submit_commandbuffer<F: FnOnce(&Device, vk::CommandBuffer)>(
pub unsafe fn record_submit_commandbuffer<F: FnOnce(&Device, vk::CommandBuffer)>(
device: &Device,
command_buffer: vk::CommandBuffer,
command_buffer_reuse_fence: vk::Fence,
Expand All @@ -50,45 +54,39 @@ pub fn record_submit_commandbuffer<F: FnOnce(&Device, vk::CommandBuffer)>(
signal_semaphores: &[vk::Semaphore],
f: F,
) {
unsafe {
device
.wait_for_fences(&[command_buffer_reuse_fence], true, u64::MAX)
.expect("Wait for fence failed.");

device
.reset_fences(&[command_buffer_reuse_fence])
.expect("Reset fences failed.");

device
.reset_command_buffer(
command_buffer,
vk::CommandBufferResetFlags::RELEASE_RESOURCES,
)
.expect("Reset command buffer failed.");

let command_buffer_begin_info = vk::CommandBufferBeginInfo::default()
.flags(vk::CommandBufferUsageFlags::ONE_TIME_SUBMIT);

device
.begin_command_buffer(command_buffer, &command_buffer_begin_info)
.expect("Begin commandbuffer");
f(device, command_buffer);
device
.end_command_buffer(command_buffer)
.expect("End commandbuffer");

let command_buffers = vec![command_buffer];

let submit_info = vk::SubmitInfo::default()
.wait_semaphores(wait_semaphores)
.wait_dst_stage_mask(wait_mask)
.command_buffers(&command_buffers)
.signal_semaphores(signal_semaphores);

device
.queue_submit(submit_queue, &[submit_info], command_buffer_reuse_fence)
.expect("queue submit failed.");
}
device
.reset_fences(&[command_buffer_reuse_fence])
.expect("Reset fences failed.");

device
.reset_command_buffer(
command_buffer,
vk::CommandBufferResetFlags::RELEASE_RESOURCES,
)
.expect("Reset command buffer failed.");

let command_buffer_begin_info =
vk::CommandBufferBeginInfo::default().flags(vk::CommandBufferUsageFlags::ONE_TIME_SUBMIT);

device
.begin_command_buffer(command_buffer, &command_buffer_begin_info)
.expect("Begin commandbuffer");
f(device, command_buffer);
device
.end_command_buffer(command_buffer)
.expect("End commandbuffer");

let command_buffers = vec![command_buffer];

let submit_info = vk::SubmitInfo::default()
.wait_semaphores(wait_semaphores)
.wait_dst_stage_mask(wait_mask)
.command_buffers(&command_buffers)
.signal_semaphores(signal_semaphores);

device
.queue_submit(submit_queue, &[submit_info], command_buffer_reuse_fence)
.expect("queue submit failed.");
}

unsafe extern "system" fn vulkan_debug_callback(
Expand Down Expand Up @@ -169,8 +167,7 @@ pub struct ExampleBase {
pub present_complete_semaphore: vk::Semaphore,
pub rendering_complete_semaphore: vk::Semaphore,

pub draw_commands_reuse_fence: vk::Fence,
pub setup_commands_reuse_fence: vk::Fence,
pub submit_complete_fence: vk::Fence,
}

impl ExampleBase {
Expand All @@ -194,7 +191,14 @@ impl ExampleBase {
} => {
elwp.exit();
}
Event::AboutToWait => f(),
Event::AboutToWait => {
unsafe {
self.device
.wait_for_fences(&[self.submit_complete_fence], true, u64::MAX)
.expect("Wait for fence failed.");
}
f()
}
_ => (),
}
})
Expand Down Expand Up @@ -472,17 +476,14 @@ impl ExampleBase {
let fence_create_info =
vk::FenceCreateInfo::default().flags(vk::FenceCreateFlags::SIGNALED);

let draw_commands_reuse_fence = device
.create_fence(&fence_create_info, None)
.expect("Create fence failed.");
let setup_commands_reuse_fence = device
let submit_complete_fence = device
.create_fence(&fence_create_info, None)
.expect("Create fence failed.");

record_submit_commandbuffer(
&device,
setup_command_buffer,
setup_commands_reuse_fence,
submit_complete_fence,
present_queue,
&[],
&[],
Expand Down Expand Up @@ -514,6 +515,9 @@ impl ExampleBase {
);
},
);
device
.wait_for_fences(&[submit_complete_fence], true, u64::MAX)
.expect("Wait for fence failed.");

let depth_image_view_info = vk::ImageViewCreateInfo::default()
.subresource_range(
Expand Down Expand Up @@ -563,8 +567,7 @@ impl ExampleBase {
depth_image_view,
present_complete_semaphore,
rendering_complete_semaphore,
draw_commands_reuse_fence,
setup_commands_reuse_fence,
submit_complete_fence,
surface,
debug_call_back,
debug_utils_loader,
Expand All @@ -582,10 +585,7 @@ impl Drop for ExampleBase {
.destroy_semaphore(self.present_complete_semaphore, None);
self.device
.destroy_semaphore(self.rendering_complete_semaphore, None);
self.device
.destroy_fence(self.draw_commands_reuse_fence, None);
self.device
.destroy_fence(self.setup_commands_reuse_fence, None);
self.device.destroy_fence(self.submit_complete_fence, None);
self.device.free_memory(self.depth_image_memory, None);
self.device.destroy_image_view(self.depth_image_view, None);
self.device.destroy_image(self.depth_image, None);
Expand Down