From ba8aa2a5271240da19e3dbcd48a80f881c276f7f Mon Sep 17 00:00:00 2001 From: marc0246 <40955683+marc0246@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:13:15 +0200 Subject: [PATCH] Revert #2421, rename `Raw[Recording]CommandBufer` again and move them (#2582) --- examples/basic-compute-shader/main.rs | 6 +- examples/buffer-allocator/main.rs | 6 +- examples/clear-attachments/main.rs | 8 +-- .../deferred/frame/ambient_lighting_system.rs | 8 +-- .../frame/directional_lighting_system.rs | 8 +-- .../deferred/frame/point_lighting_system.rs | 8 +-- examples/deferred/frame/system.rs | 12 ++-- examples/deferred/triangle_draw_system.rs | 8 +-- examples/dynamic-buffers/main.rs | 6 +- examples/dynamic-local-size/main.rs | 8 +-- examples/gl-interop/main.rs | 8 +-- examples/image-self-copy-blit/main.rs | 14 ++-- examples/image/main.rs | 12 ++-- examples/immutable-sampler/main.rs | 12 ++-- examples/indirect/main.rs | 8 +-- examples/instancing/main.rs | 6 +- .../fractal_compute_pipeline.rs | 6 +- .../pixels_draw_pipeline.rs | 8 +-- .../interactive-fractal/place_over_frame.rs | 6 +- examples/mesh-shader/main.rs | 6 +- examples/msaa-renderpass/main.rs | 8 +-- .../multi-window-game-of-life/game_of_life.rs | 10 +-- .../multi-window-game-of-life/pixels_draw.rs | 8 +-- .../multi-window-game-of-life/render_pass.rs | 6 +- examples/multi-window/main.rs | 6 +- examples/multiview/main.rs | 8 +-- examples/occlusion-query/main.rs | 6 +- examples/offscreen/main.rs | 8 +-- examples/push-constants/main.rs | 6 +- examples/push-descriptors/main.rs | 12 ++-- examples/runtime-array/main.rs | 12 ++-- examples/runtime-shader/main.rs | 6 +- examples/self-copy-buffer/main.rs | 8 +-- examples/shader-include/main.rs | 6 +- examples/shader-types-sharing/main.rs | 6 +- examples/simple-particles/main.rs | 12 ++-- examples/specialization-constants/main.rs | 6 +- examples/teapot/main.rs | 6 +- examples/tessellation/main.rs | 6 +- examples/texture-array/main.rs | 12 ++-- examples/triangle-util/main.rs | 6 +- examples/triangle-v1_3/main.rs | 6 +- examples/triangle/main.rs | 6 +- vulkano-taskgraph/src/command_buffer/mod.rs | 14 ++-- vulkano-taskgraph/src/graph/execute.rs | 23 +++---- vulkano-taskgraph/src/lib.rs | 8 +-- vulkano/src/acceleration_structure.rs | 4 +- vulkano/src/buffer/allocator.rs | 6 +- vulkano/src/buffer/mod.rs | 14 ++-- vulkano/src/command_buffer/auto/builder.rs | 48 ++++++------- vulkano/src/command_buffer/auto/mod.rs | 58 ++++++++-------- .../commands/acceleration_structure.rs | 20 +++--- .../src/command_buffer/commands/bind_push.rs | 20 +++--- vulkano/src/command_buffer/commands/clear.rs | 14 ++-- vulkano/src/command_buffer/commands/copy.rs | 18 ++--- vulkano/src/command_buffer/commands/debug.rs | 12 ++-- .../command_buffer/commands/dynamic_state.rs | 68 +++++++++---------- .../src/command_buffer/commands/pipeline.rs | 32 ++++----- vulkano/src/command_buffer/commands/query.rs | 18 ++--- .../command_buffer/commands/render_pass.rs | 24 +++---- .../src/command_buffer/commands/secondary.rs | 16 ++--- vulkano/src/command_buffer/commands/sync.rs | 4 +- vulkano/src/command_buffer/mod.rs | 25 +++---- vulkano/src/command_buffer/sys.rs | 40 +++++------ vulkano/src/pipeline/compute.rs | 10 +-- .../src/pipeline/graphics/vertex_input/mod.rs | 2 +- vulkano/src/pipeline/layout.rs | 4 +- vulkano/src/pipeline/mod.rs | 62 ++++++++--------- vulkano/src/query.rs | 24 +++---- vulkano/src/sync/event.rs | 8 +-- 70 files changed, 468 insertions(+), 468 deletions(-) diff --git a/examples/basic-compute-shader/main.rs b/examples/basic-compute-shader/main.rs index e927b128..95006848 100644 --- a/examples/basic-compute-shader/main.rs +++ b/examples/basic-compute-shader/main.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -195,7 +195,7 @@ fn main() { .unwrap(); // In order to execute our operation, we have to build a command buffer. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -224,7 +224,7 @@ fn main() { } // Finish building the command buffer by calling `build`. - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); // Let's execute this command buffer now. let future = sync::now(device) diff --git a/examples/buffer-allocator/main.rs b/examples/buffer-allocator/main.rs index 7c8ce7a2..6b9f744f 100644 --- a/examples/buffer-allocator/main.rs +++ b/examples/buffer-allocator/main.rs @@ -11,7 +11,7 @@ use vulkano::{ BufferContents, BufferUsage, }, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -419,7 +419,7 @@ impl ApplicationHandler for App { .unwrap(); buffer.write().unwrap().copy_from_slice(&data); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -451,7 +451,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/clear-attachments/main.rs b/examples/clear-attachments/main.rs index d576dabf..0d4a8c8c 100644 --- a/examples/clear-attachments/main.rs +++ b/examples/clear-attachments/main.rs @@ -1,8 +1,8 @@ use std::{error::Error, sync::Arc}; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, ClearAttachment, ClearRect, CommandBufferUsage, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, ClearAttachment, + ClearRect, CommandBufferUsage, RenderPassBeginInfo, }, device::{ physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, Queue, @@ -264,7 +264,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -318,7 +318,7 @@ impl ApplicationHandler for App { .unwrap() .end_render_pass(Default::default()) .unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/examples/deferred/frame/ambient_lighting_system.rs b/examples/deferred/frame/ambient_lighting_system.rs index c0625854..88dcdfc2 100644 --- a/examples/deferred/frame/ambient_lighting_system.rs +++ b/examples/deferred/frame/ambient_lighting_system.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -177,7 +177,7 @@ impl AmbientLightingSystem { depth_range: 0.0..=1.0, }; - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -211,7 +211,7 @@ impl AmbientLightingSystem { .unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/deferred/frame/directional_lighting_system.rs b/examples/deferred/frame/directional_lighting_system.rs index 35e0e1f0..9660f96b 100644 --- a/examples/deferred/frame/directional_lighting_system.rs +++ b/examples/deferred/frame/directional_lighting_system.rs @@ -4,8 +4,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -191,7 +191,7 @@ impl DirectionalLightingSystem { depth_range: 0.0..=1.0, }; - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -225,7 +225,7 @@ impl DirectionalLightingSystem { .unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/deferred/frame/point_lighting_system.rs b/examples/deferred/frame/point_lighting_system.rs index 2e9e606f..fa7d2bd5 100644 --- a/examples/deferred/frame/point_lighting_system.rs +++ b/examples/deferred/frame/point_lighting_system.rs @@ -4,8 +4,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -204,7 +204,7 @@ impl PointLightingSystem { depth_range: 0.0..=1.0, }; - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -238,7 +238,7 @@ impl PointLightingSystem { .unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/deferred/frame/system.rs b/examples/deferred/frame/system.rs index 6f6fd95e..c99c533c 100644 --- a/examples/deferred/frame/system.rs +++ b/examples/deferred/frame/system.rs @@ -7,9 +7,9 @@ use glam::f32::{Mat4, Vec3}; use std::sync::Arc; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, PrimaryAutoCommandBuffer, - RecordingCommandBuffer, RenderPassBeginInfo, SecondaryAutoCommandBuffer, SubpassBeginInfo, - SubpassContents, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + PrimaryAutoCommandBuffer, RenderPassBeginInfo, SecondaryAutoCommandBuffer, + SubpassBeginInfo, SubpassContents, }, descriptor_set::allocator::StandardDescriptorSetAllocator, device::Queue, @@ -338,7 +338,7 @@ impl FrameSystem { .unwrap(); // Start the command buffer builder that will be filled throughout the frame handling. - let mut command_buffer_builder = RecordingCommandBuffer::primary( + let mut command_buffer_builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -394,7 +394,7 @@ pub struct Frame<'a> { // Framebuffer that was used when starting the render pass. framebuffer: Arc, // The command buffer builder that will be built during the lifetime of this object. - command_buffer_builder: Option>, + command_buffer_builder: Option>, // Matrix that was passed to `frame()`. world_to_framebuffer: Mat4, } @@ -444,7 +444,7 @@ impl<'a> Frame<'a> { .unwrap() .end_render_pass(Default::default()) .unwrap(); - let command_buffer = self.command_buffer_builder.take().unwrap().end().unwrap(); + let command_buffer = self.command_buffer_builder.take().unwrap().build().unwrap(); // Extract `before_main_cb_future` and append the command buffer execution to it. let after_main_cb = self diff --git a/examples/deferred/triangle_draw_system.rs b/examples/deferred/triangle_draw_system.rs index 7447d6f9..ab41a595 100644 --- a/examples/deferred/triangle_draw_system.rs +++ b/examples/deferred/triangle_draw_system.rs @@ -2,8 +2,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, device::Queue, memory::allocator::{AllocationCreateInfo, MemoryTypeFilter, StandardMemoryAllocator}, @@ -126,7 +126,7 @@ impl TriangleDrawSystem { /// Builds a secondary command buffer that draws the triangle on the current subpass. pub fn draw(&self, viewport_dimensions: [u32; 2]) -> Arc { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -160,7 +160,7 @@ impl TriangleDrawSystem { .unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/dynamic-buffers/main.rs b/examples/dynamic-buffers/main.rs index 317582b6..8d11432f 100644 --- a/examples/dynamic-buffers/main.rs +++ b/examples/dynamic-buffers/main.rs @@ -8,7 +8,7 @@ use std::{iter::repeat, mem::size_of, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, layout::DescriptorType, DescriptorBufferInfo, @@ -237,7 +237,7 @@ fn main() { .unwrap(); // Build the command buffer, using different offsets for each call. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -261,7 +261,7 @@ fn main() { } } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/dynamic-local-size/main.rs b/examples/dynamic-local-size/main.rs index 89cb5347..86c1d1b1 100644 --- a/examples/dynamic-local-size/main.rs +++ b/examples/dynamic-local-size/main.rs @@ -8,8 +8,8 @@ use std::{fs::File, io::BufWriter, path::Path, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyImageToBufferInfo, - RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyImageToBufferInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -249,7 +249,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -278,7 +278,7 @@ fn main() { .copy_image_to_buffer(CopyImageToBufferInfo::image_buffer(image, buf.clone())) .unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/gl-interop/main.rs b/examples/gl-interop/main.rs index ce63e6da..c3389aad 100644 --- a/examples/gl-interop/main.rs +++ b/examples/gl-interop/main.rs @@ -20,8 +20,8 @@ mod linux { use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, - RenderPassBeginInfo, SemaphoreSubmitInfo, SubmitInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferUsage, RenderPassBeginInfo, SemaphoreSubmitInfo, SubmitInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -702,7 +702,7 @@ mod linux { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -742,7 +742,7 @@ mod linux { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/examples/image-self-copy-blit/main.rs b/examples/image-self-copy-blit/main.rs index 2155de23..af3da638 100644 --- a/examples/image-self-copy-blit/main.rs +++ b/examples/image-self-copy-blit/main.rs @@ -2,9 +2,9 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, BlitImageInfo, BufferImageCopy, - ClearColorImageInfo, CommandBufferUsage, CopyBufferToImageInfo, CopyImageInfo, ImageBlit, - ImageCopy, RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BlitImageInfo, + BufferImageCopy, ClearColorImageInfo, CommandBufferUsage, CopyBufferToImageInfo, + CopyImageInfo, ImageBlit, ImageCopy, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -185,7 +185,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -306,7 +306,7 @@ impl App { ) .unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -523,7 +523,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -563,7 +563,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/image/main.rs b/examples/image/main.rs index 3f3fc6a7..ea26f9fd 100644 --- a/examples/image/main.rs +++ b/examples/image/main.rs @@ -2,8 +2,8 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferToImageInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferToImageInfo, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -183,7 +183,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -250,7 +250,7 @@ impl App { ) .unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -467,7 +467,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -507,7 +507,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/immutable-sampler/main.rs b/examples/immutable-sampler/main.rs index bfb9348e..db15d144 100644 --- a/examples/immutable-sampler/main.rs +++ b/examples/immutable-sampler/main.rs @@ -11,8 +11,8 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferToImageInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferToImageInfo, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -189,7 +189,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -256,7 +256,7 @@ impl App { ) .unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -486,7 +486,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -526,7 +526,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/indirect/main.rs b/examples/indirect/main.rs index 02c85e89..5f2b08e2 100644 --- a/examples/indirect/main.rs +++ b/examples/indirect/main.rs @@ -21,8 +21,8 @@ use vulkano::{ BufferContents, BufferUsage, }, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, DrawIndirectCommand, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + DrawIndirectCommand, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -522,7 +522,7 @@ impl ApplicationHandler for App { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -572,7 +572,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/examples/instancing/main.rs b/examples/instancing/main.rs index fc18ba79..1a53b183 100644 --- a/examples/instancing/main.rs +++ b/examples/instancing/main.rs @@ -7,7 +7,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -442,7 +442,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -484,7 +484,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/interactive-fractal/fractal_compute_pipeline.rs b/examples/interactive-fractal/fractal_compute_pipeline.rs index 604d62a9..20fb65ea 100644 --- a/examples/interactive-fractal/fractal_compute_pipeline.rs +++ b/examples/interactive-fractal/fractal_compute_pipeline.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -146,7 +146,7 @@ impl FractalComputePipeline { [], ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -182,7 +182,7 @@ impl FractalComputePipeline { .unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let finished = command_buffer.execute(self.queue.clone()).unwrap(); finished.then_signal_fence_and_flush().unwrap().boxed() } diff --git a/examples/interactive-fractal/pixels_draw_pipeline.rs b/examples/interactive-fractal/pixels_draw_pipeline.rs index 7b072efc..fcdd4343 100644 --- a/examples/interactive-fractal/pixels_draw_pipeline.rs +++ b/examples/interactive-fractal/pixels_draw_pipeline.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -130,7 +130,7 @@ impl PixelsDrawPipeline { viewport_dimensions: [u32; 2], image: Arc, ) -> Arc { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -167,7 +167,7 @@ impl PixelsDrawPipeline { builder.draw(6, 1, 0, 0).unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/interactive-fractal/place_over_frame.rs b/examples/interactive-fractal/place_over_frame.rs index 796b7a8f..bc0c07d1 100644 --- a/examples/interactive-fractal/place_over_frame.rs +++ b/examples/interactive-fractal/place_over_frame.rs @@ -2,7 +2,7 @@ use crate::pixels_draw_pipeline::PixelsDrawPipeline; use std::sync::Arc; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, }, descriptor_set::allocator::StandardDescriptorSetAllocator, @@ -79,7 +79,7 @@ impl RenderPassPlaceOverFrame { let img_dims: [u32; 2] = target.image().extent()[0..2].try_into().unwrap(); // Create primary command buffer builder. - let mut command_buffer_builder = RecordingCommandBuffer::primary( + let mut command_buffer_builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -114,7 +114,7 @@ impl RenderPassPlaceOverFrame { .unwrap(); // Build command buffer. - let command_buffer = command_buffer_builder.end().unwrap(); + let command_buffer = command_buffer_builder.build().unwrap(); // Execute primary command buffer. let after_future = before_future diff --git a/examples/mesh-shader/main.rs b/examples/mesh-shader/main.rs index 8749cbfc..870cda1a 100644 --- a/examples/mesh-shader/main.rs +++ b/examples/mesh-shader/main.rs @@ -17,7 +17,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, descriptor_set::{ @@ -446,7 +446,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -483,7 +483,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/msaa-renderpass/main.rs b/examples/msaa-renderpass/main.rs index ac09980c..cbce00b8 100644 --- a/examples/msaa-renderpass/main.rs +++ b/examples/msaa-renderpass/main.rs @@ -57,8 +57,8 @@ use std::{fs::File, io::BufWriter, path::Path, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyImageToBufferInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyImageToBufferInfo, RenderPassBeginInfo, }, device::{ physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, QueueCreateInfo, @@ -379,7 +379,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -412,7 +412,7 @@ fn main() { .copy_image_to_buffer(CopyImageToBufferInfo::image_buffer(image, buf.clone())) .unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let finished = command_buffer.execute(queue).unwrap(); finished .then_signal_fence_and_flush() diff --git a/examples/multi-window-game-of-life/game_of_life.rs b/examples/multi-window-game-of-life/game_of_life.rs index 1f282c3e..06071c7e 100644 --- a/examples/multi-window-game-of-life/game_of_life.rs +++ b/examples/multi-window-game-of-life/game_of_life.rs @@ -5,8 +5,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, PrimaryAutoCommandBuffer, - RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + PrimaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -130,7 +130,7 @@ impl GameOfLifeComputePipeline { life_color: [f32; 4], dead_color: [f32; 4], ) -> Box { - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.compute_queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -148,7 +148,7 @@ impl GameOfLifeComputePipeline { // Then color based on the next state. self.dispatch(&mut builder, life_color, dead_color, 1); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let finished = before_future .then_execute(self.compute_queue.clone(), command_buffer) .unwrap(); @@ -163,7 +163,7 @@ impl GameOfLifeComputePipeline { /// Builds the command for a dispatch. fn dispatch( &self, - builder: &mut RecordingCommandBuffer, + builder: &mut AutoCommandBufferBuilder, life_color: [f32; 4], dead_color: [f32; 4], // Step determines whether we color or compute life (see branch in the shader)s. diff --git a/examples/multi-window-game-of-life/pixels_draw.rs b/examples/multi-window-game-of-life/pixels_draw.rs index 028725ed..e41dda63 100644 --- a/examples/multi-window-game-of-life/pixels_draw.rs +++ b/examples/multi-window-game-of-life/pixels_draw.rs @@ -2,8 +2,8 @@ use crate::App; use std::sync::Arc; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferInheritanceInfo, - CommandBufferUsage, RecordingCommandBuffer, SecondaryAutoCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, + CommandBufferInheritanceInfo, CommandBufferUsage, SecondaryAutoCommandBuffer, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -126,7 +126,7 @@ impl PixelsDrawPipeline { viewport_dimensions: [u32; 2], image: Arc, ) -> Arc { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -163,7 +163,7 @@ impl PixelsDrawPipeline { builder.draw(6, 1, 0, 0).unwrap(); } - builder.end().unwrap() + builder.build().unwrap() } } diff --git a/examples/multi-window-game-of-life/render_pass.rs b/examples/multi-window-game-of-life/render_pass.rs index ccd9682a..081d80e3 100644 --- a/examples/multi-window-game-of-life/render_pass.rs +++ b/examples/multi-window-game-of-life/render_pass.rs @@ -2,7 +2,7 @@ use crate::{pixels_draw::PixelsDrawPipeline, App}; use std::sync::Arc; use vulkano::{ command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, }, device::Queue, @@ -68,7 +68,7 @@ impl RenderPassPlaceOverFrame { let img_dims: [u32; 2] = target.image().extent()[0..2].try_into().unwrap(); // Create a primary command buffer builder. - let mut command_buffer_builder = RecordingCommandBuffer::primary( + let mut command_buffer_builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.gfx_queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -103,7 +103,7 @@ impl RenderPassPlaceOverFrame { .unwrap(); // Build the command buffer. - let command_buffer = command_buffer_builder.end().unwrap(); + let command_buffer = command_buffer_builder.build().unwrap(); // Execute primary command buffer. let after_future = before_future diff --git a/examples/multi-window/main.rs b/examples/multi-window/main.rs index a3b58e80..ae1f47e3 100644 --- a/examples/multi-window/main.rs +++ b/examples/multi-window/main.rs @@ -11,7 +11,7 @@ use std::{collections::HashMap, error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -422,7 +422,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -455,7 +455,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/multiview/main.rs b/examples/multiview/main.rs index e065c3e0..e3652f9f 100644 --- a/examples/multiview/main.rs +++ b/examples/multiview/main.rs @@ -7,8 +7,8 @@ use std::{fs::File, io::BufWriter, path::Path, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, BufferImageCopy, CommandBufferUsage, - CopyImageToBufferInfo, RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BufferImageCopy, + CommandBufferUsage, CopyImageToBufferInfo, RenderPassBeginInfo, }, device::{ physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, DeviceFeatures, @@ -328,7 +328,7 @@ fn main() { let buffer1 = create_buffer(); let buffer2 = create_buffer(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -387,7 +387,7 @@ fn main() { }) .unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/occlusion-query/main.rs b/examples/occlusion-query/main.rs index 1fa6eaca..759cc1be 100644 --- a/examples/occlusion-query/main.rs +++ b/examples/occlusion-query/main.rs @@ -6,7 +6,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -478,7 +478,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -548,7 +548,7 @@ impl ApplicationHandler for App { .unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/examples/offscreen/main.rs b/examples/offscreen/main.rs index fffaef7c..53c3a8f3 100644 --- a/examples/offscreen/main.rs +++ b/examples/offscreen/main.rs @@ -5,8 +5,8 @@ use std::{default::Default, fs::File, io::BufWriter, path::Path, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyImageToBufferInfo, - RecordingCommandBuffer, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyImageToBufferInfo, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, }, device::{physical::PhysicalDeviceType, Device, DeviceCreateInfo, QueueCreateInfo, QueueFlags}, format::Format, @@ -273,7 +273,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -314,7 +314,7 @@ fn main() { )) .unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let finished = command_buffer.clone().execute(queue.clone()).unwrap(); diff --git a/examples/push-constants/main.rs b/examples/push-constants/main.rs index 7c0593f1..d92e17a2 100644 --- a/examples/push-constants/main.rs +++ b/examples/push-constants/main.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -180,7 +180,7 @@ fn main() { // // Note that there is no type safety for the push constant data, so be careful to only pass an // instance of the struct generated by the `vulkano_shaders::shaders!` macro. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -204,7 +204,7 @@ fn main() { builder.dispatch([1024, 1, 1]).unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/push-descriptors/main.rs b/examples/push-descriptors/main.rs index 3fdb9883..b051e7e9 100644 --- a/examples/push-descriptors/main.rs +++ b/examples/push-descriptors/main.rs @@ -2,8 +2,8 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferToImageInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferToImageInfo, RenderPassBeginInfo, }, descriptor_set::{layout::DescriptorSetLayoutCreateFlags, WriteDescriptorSet}, device::{ @@ -173,7 +173,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -240,7 +240,7 @@ impl App { ) .unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -452,7 +452,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -499,7 +499,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/runtime-array/main.rs b/examples/runtime-array/main.rs index 6882d24e..2f400b40 100644 --- a/examples/runtime-array/main.rs +++ b/examples/runtime-array/main.rs @@ -2,8 +2,8 @@ use std::{error::Error, io::Cursor, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferToImageInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferToImageInfo, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, layout::DescriptorBindingFlags, DescriptorSet, @@ -241,7 +241,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -358,7 +358,7 @@ impl App { ) .unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -594,7 +594,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -634,7 +634,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/runtime-shader/main.rs b/examples/runtime-shader/main.rs index cbb7024d..9ebb9254 100644 --- a/examples/runtime-shader/main.rs +++ b/examples/runtime-shader/main.rs @@ -16,7 +16,7 @@ use std::{error::Error, fs::File, io::Read, path::Path, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -390,7 +390,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -423,7 +423,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/self-copy-buffer/main.rs b/examples/self-copy-buffer/main.rs index 68a6d0ae..1cbc74bd 100644 --- a/examples/self-copy-buffer/main.rs +++ b/examples/self-copy-buffer/main.rs @@ -6,8 +6,8 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, BufferCopy, CommandBufferUsage, - CopyBufferInfoTyped, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, BufferCopy, + CommandBufferUsage, CopyBufferInfoTyped, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -162,7 +162,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -197,7 +197,7 @@ fn main() { builder.dispatch([1024, 1, 1]).unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/shader-include/main.rs b/examples/shader-include/main.rs index 0d811e42..3c33f61c 100644 --- a/examples/shader-include/main.rs +++ b/examples/shader-include/main.rs @@ -6,7 +6,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -166,7 +166,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -188,7 +188,7 @@ fn main() { builder.dispatch([1024, 1, 1]).unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) .unwrap() diff --git a/examples/shader-types-sharing/main.rs b/examples/shader-types-sharing/main.rs index b0f35c8e..949fae5e 100644 --- a/examples/shader-types-sharing/main.rs +++ b/examples/shader-types-sharing/main.rs @@ -20,7 +20,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -192,7 +192,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -216,7 +216,7 @@ fn main() { builder.dispatch([1024, 1, 1]).unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(queue.device().clone()) .then_execute(queue.clone(), command_buffer) .unwrap() diff --git a/examples/simple-particles/main.rs b/examples/simple-particles/main.rs index c41bb141..8fdab1cb 100644 --- a/examples/simple-particles/main.rs +++ b/examples/simple-particles/main.rs @@ -7,8 +7,8 @@ use std::{error::Error, sync::Arc, time::SystemTime}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferInfo, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -210,7 +210,7 @@ impl App { .unwrap(); // Create one-time command to copy between the buffers. - let mut cbb = RecordingCommandBuffer::primary( + let mut cbb = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -221,7 +221,7 @@ impl App { device_local_buffer.clone(), )) .unwrap(); - let cb = cbb.end().unwrap(); + let cb = cbb.build().unwrap(); // Execute copy and wait for copy to complete before proceeding. cb.execute(queue.clone()) @@ -538,7 +538,7 @@ impl ApplicationHandler for App { "not handling sub-optimal swapchains in this sample code", ); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -589,7 +589,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/specialization-constants/main.rs b/examples/specialization-constants/main.rs index 07ee99a4..c142f00e 100644 --- a/examples/specialization-constants/main.rs +++ b/examples/specialization-constants/main.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use vulkano::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -169,7 +169,7 @@ fn main() { ) .unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( command_buffer_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -191,7 +191,7 @@ fn main() { builder.dispatch([1024, 1, 1]).unwrap(); } - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = sync::now(device) .then_execute(queue, command_buffer) diff --git a/examples/teapot/main.rs b/examples/teapot/main.rs index d49f4f86..de04908b 100644 --- a/examples/teapot/main.rs +++ b/examples/teapot/main.rs @@ -10,7 +10,7 @@ use vulkano::{ Buffer, BufferCreateInfo, BufferUsage, Subbuffer, }, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, descriptor_set::{ @@ -444,7 +444,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -490,7 +490,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/tessellation/main.rs b/examples/tessellation/main.rs index 63f7f96d..e20f6467 100644 --- a/examples/tessellation/main.rs +++ b/examples/tessellation/main.rs @@ -16,7 +16,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, }, device::{ @@ -417,7 +417,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -450,7 +450,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/texture-array/main.rs b/examples/texture-array/main.rs index 0118b0b8..e4fe59a2 100644 --- a/examples/texture-array/main.rs +++ b/examples/texture-array/main.rs @@ -2,8 +2,8 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, CopyBufferToImageInfo, - RecordingCommandBuffer, RenderPassBeginInfo, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, + CopyBufferToImageInfo, RenderPassBeginInfo, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -186,7 +186,7 @@ impl App { ) .unwrap(); - let mut uploads = RecordingCommandBuffer::primary( + let mut uploads = AutoCommandBufferBuilder::primary( command_buffer_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -263,7 +263,7 @@ impl App { let sampler = Sampler::new(device.clone(), SamplerCreateInfo::simple_repeat_linear()).unwrap(); - let _ = uploads.end().unwrap().execute(queue.clone()).unwrap(); + let _ = uploads.build().unwrap().execute(queue.clone()).unwrap(); App { instance, @@ -480,7 +480,7 @@ impl ApplicationHandler for App { rcx.recreate_swapchain = true; } - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -520,7 +520,7 @@ impl ApplicationHandler for App { builder.end_render_pass(Default::default()).unwrap(); - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end .take() diff --git a/examples/triangle-util/main.rs b/examples/triangle-util/main.rs index 17425e89..db297d71 100644 --- a/examples/triangle-util/main.rs +++ b/examples/triangle-util/main.rs @@ -11,7 +11,7 @@ use std::{error::Error, sync::Arc, time::Duration}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, }, image::view::ImageView, @@ -381,7 +381,7 @@ impl ApplicationHandler for App { // // Note that we have to pass a queue family when we create the command buffer. The // command buffer will only be executable on that given queue family. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.context.graphics_queue().queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -437,7 +437,7 @@ impl ApplicationHandler for App { .unwrap(); // Finish recording the command buffer by calling `end`. - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = previous_frame_end .then_execute(self.context.graphics_queue().clone(), command_buffer) diff --git a/examples/triangle-v1_3/main.rs b/examples/triangle-v1_3/main.rs index bd7a0591..af498f8d 100644 --- a/examples/triangle-v1_3/main.rs +++ b/examples/triangle-v1_3/main.rs @@ -16,7 +16,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderingAttachmentInfo, RenderingInfo, }, device::{ @@ -644,7 +644,7 @@ impl ApplicationHandler for App { // // Note that we have to pass a queue family when we create the command buffer. The // command buffer will only be executable on that given queue family. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -703,7 +703,7 @@ impl ApplicationHandler for App { .unwrap(); // Finish recording the command buffer by calling `end`. - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/examples/triangle/main.rs b/examples/triangle/main.rs index f6adbfd5..64a45a29 100644 --- a/examples/triangle/main.rs +++ b/examples/triangle/main.rs @@ -11,7 +11,7 @@ use std::{error::Error, sync::Arc}; use vulkano::{ buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, RenderPassBeginInfo, SubpassBeginInfo, SubpassContents, }, device::{ @@ -648,7 +648,7 @@ impl ApplicationHandler for App { // // Note that we have to pass a queue family when we create the command buffer. The // command buffer will only be executable on that given queue family. - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( self.command_buffer_allocator.clone(), self.queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -704,7 +704,7 @@ impl ApplicationHandler for App { .unwrap(); // Finish recording the command buffer by calling `end`. - let command_buffer = builder.end().unwrap(); + let command_buffer = builder.build().unwrap(); let future = rcx .previous_frame_end diff --git a/vulkano-taskgraph/src/command_buffer/mod.rs b/vulkano-taskgraph/src/command_buffer/mod.rs index 380461b8..6e68dad0 100644 --- a/vulkano-taskgraph/src/command_buffer/mod.rs +++ b/vulkano-taskgraph/src/command_buffer/mod.rs @@ -7,7 +7,7 @@ use ash::vk; use std::{any::Any, sync::Arc}; use vulkano::{ buffer::Buffer, - command_buffer::sys::RawRecordingCommandBuffer, + command_buffer as raw, device::{Device, DeviceOwned}, image::Image, VulkanObject, @@ -17,10 +17,12 @@ mod commands; /// A command buffer in the recording state. /// -/// Unlike [`RawRecordingCommandBuffer`], this type has knowledge of the current task context and -/// can therefore validate resource accesses. (TODO) +/// Unlike [the raw `RecordingCommandBuffer`], this type has knowledge of the current task context +/// and can therefore validate resource accesses. (TODO) +/// +/// [the raw `RecordingCommandBuffer`]: raw::RecordingCommandBuffer pub struct RecordingCommandBuffer<'a> { - inner: &'a mut RawRecordingCommandBuffer, + inner: &'a mut raw::RecordingCommandBuffer, accesses: ResourceAccesses<'a>, death_row: &'a mut DeathRow, } @@ -31,7 +33,7 @@ struct ResourceAccesses<'a> { impl<'a> RecordingCommandBuffer<'a> { pub(crate) unsafe fn new( - inner: &'a mut RawRecordingCommandBuffer, + inner: &'a mut raw::RecordingCommandBuffer, resource_map: &'a ResourceMap<'a>, death_row: &'a mut DeathRow, ) -> Self { @@ -50,7 +52,7 @@ impl<'a> RecordingCommandBuffer<'a> { /// transitions and queue family ownership transfers), or that no other task is accessing the /// subresources at the same time without appropriate synchronization. #[inline] - pub fn as_raw(&mut self) -> &mut RawRecordingCommandBuffer { + pub fn as_raw(&mut self) -> &mut raw::RecordingCommandBuffer { self.inner } diff --git a/vulkano-taskgraph/src/graph/execute.rs b/vulkano-taskgraph/src/graph/execute.rs index b134b48b..61eb5c53 100644 --- a/vulkano-taskgraph/src/graph/execute.rs +++ b/vulkano-taskgraph/src/graph/execute.rs @@ -20,10 +20,7 @@ use std::{ }; use vulkano::{ buffer::{Buffer, BufferMemory}, - command_buffer::{ - sys::{CommandBufferBeginInfo, RawCommandBuffer, RawRecordingCommandBuffer}, - CommandBufferLevel, CommandBufferUsage, - }, + command_buffer as raw, device::{Device, DeviceOwned, Queue}, image::Image, swapchain::{AcquireNextImageInfo, AcquiredImage, Swapchain}, @@ -619,8 +616,8 @@ struct ExecuteState2<'a, W: ?Sized + 'static> { queue_submit2: vk::PFN_vkQueueSubmit2, per_submits: SmallVec<[PerSubmitInfo2; 4]>, current_per_submit: PerSubmitInfo2, - current_command_buffer: Option, - command_buffers: Vec>, + current_command_buffer: Option, + command_buffers: Vec>, current_buffer_barriers: Vec>, current_image_barriers: Vec>, } @@ -1042,8 +1039,8 @@ struct ExecuteState<'a, W: ?Sized + 'static> { queue_submit: vk::PFN_vkQueueSubmit, per_submits: SmallVec<[PerSubmitInfo; 4]>, current_per_submit: PerSubmitInfo, - current_command_buffer: Option, - command_buffers: Vec>, + current_command_buffer: Option, + command_buffers: Vec>, current_buffer_barriers: Vec>, current_image_barriers: Vec>, current_src_stage_mask: vk::PipelineStageFlags, @@ -1493,17 +1490,17 @@ use current_command_buffer; fn create_command_buffer( resource_map: &ResourceMap<'_>, queue: &Queue, -) -> Result { +) -> Result { let allocator = resource_map.physical_resources.command_buffer_allocator(); // SAFETY: The parameters are valid. unsafe { - RawRecordingCommandBuffer::new_unchecked( + raw::RecordingCommandBuffer::new_unchecked( allocator.clone(), queue.queue_family_index(), - CommandBufferLevel::Primary, - CommandBufferBeginInfo { - usage: CommandBufferUsage::OneTimeSubmit, + raw::CommandBufferLevel::Primary, + raw::CommandBufferBeginInfo { + usage: raw::CommandBufferUsage::OneTimeSubmit, inheritance_info: None, ..Default::default() }, diff --git a/vulkano-taskgraph/src/lib.rs b/vulkano-taskgraph/src/lib.rs index caa2498d..c00f4bb4 100644 --- a/vulkano-taskgraph/src/lib.rs +++ b/vulkano-taskgraph/src/lib.rs @@ -21,7 +21,7 @@ use std::{ }; use vulkano::{ buffer::{Buffer, BufferContents, BufferMemory, Subbuffer}, - command_buffer::sys::RawCommandBuffer, + command_buffer as raw, device::Queue, image::Image, swapchain::Swapchain, @@ -229,7 +229,7 @@ impl Task for PhantomData W> { pub struct TaskContext<'a> { resource_map: &'a ResourceMap<'a>, current_frame_index: u32, - command_buffers: &'a mut Vec>, + command_buffers: &'a mut Vec>, } impl<'a> TaskContext<'a> { @@ -510,7 +510,7 @@ impl<'a> TaskContext<'a> { /// buffer must not do any accesses not accounted for in the [task's access set], or ensure /// that such accesses are appropriately synchronized. #[inline] - pub unsafe fn push_command_buffer(&mut self, command_buffer: Arc) { + pub unsafe fn push_command_buffer(&mut self, command_buffer: Arc) { self.command_buffers.push(command_buffer); } @@ -527,7 +527,7 @@ impl<'a> TaskContext<'a> { #[inline] pub unsafe fn extend_command_buffers( &mut self, - command_buffers: impl IntoIterator>, + command_buffers: impl IntoIterator>, ) { self.command_buffers.extend(command_buffers); } diff --git a/vulkano/src/acceleration_structure.rs b/vulkano/src/acceleration_structure.rs index aa8484da..8af94151 100644 --- a/vulkano/src/acceleration_structure.rs +++ b/vulkano/src/acceleration_structure.rs @@ -79,8 +79,8 @@ //! acceleration structure to a descriptor set using //! [`WriteDescriptorSet::acceleration_structure`]. //! -//! [`build_acceleration_structure`]: crate::command_buffer::RecordingCommandBuffer::build_acceleration_structure -//! [`build_acceleration_structure_indirect`]: crate::command_buffer::RecordingCommandBuffer::build_acceleration_structure_indirect +//! [`build_acceleration_structure`]: crate::command_buffer::AutoCommandBufferBuilder::build_acceleration_structure +//! [`build_acceleration_structure_indirect`]: crate::command_buffer::AutoCommandBufferBuilder::build_acceleration_structure_indirect //! [`DescriptorType::AccelerationStructure`]: crate::descriptor_set::layout::DescriptorType::AccelerationStructure //! [`WriteDescriptorSet::acceleration_structure`]: crate::descriptor_set::WriteDescriptorSet::acceleration_structure diff --git a/vulkano/src/buffer/allocator.rs b/vulkano/src/buffer/allocator.rs index 61345c89..9139f2da 100644 --- a/vulkano/src/buffer/allocator.rs +++ b/vulkano/src/buffer/allocator.rs @@ -78,7 +78,7 @@ const MAX_ARENAS: usize = 32; /// allocator::{SubbufferAllocator, SubbufferAllocatorCreateInfo}, /// BufferUsage, /// }, -/// command_buffer::{CommandBufferUsage, RecordingCommandBuffer}, +/// command_buffer::{AutoCommandBufferBuilder, CommandBufferUsage}, /// memory::allocator::MemoryTypeFilter, /// sync::GpuFuture, /// }; @@ -105,7 +105,7 @@ const MAX_ARENAS: usize = 32; /// *subbuffer.write().unwrap() = data; /// /// // You can then use `subbuffer` as if it was an entirely separate buffer. -/// RecordingCommandBuffer::primary( +/// AutoCommandBufferBuilder::primary( /// command_buffer_allocator.clone(), /// queue.queue_family_index(), /// CommandBufferUsage::OneTimeSubmit, @@ -115,7 +115,7 @@ const MAX_ARENAS: usize = 32; /// // it is pointless to do that. /// .update_buffer(subbuffer.clone(), &[0.2, 0.3, 0.4, 0.5]) /// .unwrap() -/// .end() +/// .build() /// .unwrap() /// .execute(queue.clone()) /// .unwrap() diff --git a/vulkano/src/buffer/mod.rs b/vulkano/src/buffer/mod.rs index bacb68a8..e234165a 100644 --- a/vulkano/src/buffer/mod.rs +++ b/vulkano/src/buffer/mod.rs @@ -120,7 +120,7 @@ pub mod view; /// ``` /// use vulkano::{ /// buffer::{BufferUsage, Buffer, BufferCreateInfo}, -/// command_buffer::{CommandBufferUsage, CopyBufferInfo, RecordingCommandBuffer}, +/// command_buffer::{AutoCommandBufferBuilder, CommandBufferUsage, CopyBufferInfo}, /// memory::allocator::{AllocationCreateInfo, MemoryTypeFilter}, /// sync::GpuFuture, /// DeviceSize, @@ -170,18 +170,18 @@ pub mod view; /// .unwrap(); /// /// // Create a one-time command to copy between the buffers. -/// let mut cbb = RecordingCommandBuffer::primary( +/// let mut cbb = AutoCommandBufferBuilder::primary( /// command_buffer_allocator.clone(), /// queue.queue_family_index(), /// CommandBufferUsage::OneTimeSubmit, /// ) /// .unwrap(); /// cbb.copy_buffer(CopyBufferInfo::buffers( -/// temporary_accessible_buffer, -/// device_local_buffer.clone(), -/// )) -/// .unwrap(); -/// let cb = cbb.end().unwrap(); +/// temporary_accessible_buffer, +/// device_local_buffer.clone(), +/// )) +/// .unwrap(); +/// let cb = cbb.build().unwrap(); /// /// // Execute the copy command and wait for completion before proceeding. /// cb.execute(queue.clone()) diff --git a/vulkano/src/command_buffer/auto/builder.rs b/vulkano/src/command_buffer/auto/builder.rs index 5a92b14a..13062f26 100644 --- a/vulkano/src/command_buffer/auto/builder.rs +++ b/vulkano/src/command_buffer/auto/builder.rs @@ -6,7 +6,7 @@ use crate::{ buffer::{Buffer, IndexBuffer, Subbuffer}, command_buffer::{ allocator::CommandBufferAllocator, - sys::{CommandBufferBeginInfo, RawCommandBuffer, RawRecordingCommandBuffer}, + sys::{CommandBuffer, CommandBufferBeginInfo, RecordingCommandBuffer}, CommandBufferBufferRangeUsage, CommandBufferBufferUsage, CommandBufferImageRangeUsage, CommandBufferImageUsage, CommandBufferInheritanceInfo, CommandBufferInheritanceRenderPassType, CommandBufferLevel, CommandBufferResourcesUsage, @@ -55,29 +55,29 @@ use std::{ /// A command buffer in the recording state. /// -/// Unlike [`RawRecordingCommandBuffer`], this type does resource tracking and inserts pipeline +/// Unlike [`RecordingCommandBuffer`], this type does resource tracking and inserts pipeline /// barriers automatically. /// /// Note that command buffers in the recording state don't implement the `Send` and `Sync` traits. /// Once a command buffer has finished recording, however, it *does* implement `Send` and `Sync`. -pub struct RecordingCommandBuffer { - pub(in crate::command_buffer) inner: RawRecordingCommandBuffer, +pub struct AutoCommandBufferBuilder { + pub(in crate::command_buffer) inner: RecordingCommandBuffer, commands: Vec<( CommandInfo, - Box, + Box, )>, pub(in crate::command_buffer) builder_state: CommandBufferBuilderState, marker: PhantomData L>, } -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Allocates and begins recording a new primary command buffer. #[inline] pub fn primary( allocator: Arc, queue_family_index: u32, usage: CommandBufferUsage, - ) -> Result, Validated> { + ) -> Result, Validated> { unsafe { Self::new( allocator, @@ -98,7 +98,7 @@ impl RecordingCommandBuffer { allocator: Arc, queue_family_index: u32, usage: CommandBufferUsage, - ) -> Result, Validated> { + ) -> Result, Validated> { unsafe { Self::new_unchecked( allocator, @@ -114,7 +114,7 @@ impl RecordingCommandBuffer { } /// Ends the recording, returning a command buffer which can be submitted. - pub fn end(self) -> Result, Validated> { + pub fn build(self) -> Result, Validated> { self.validate_end()?; let (inner, keep_alive_objects, resources_usage, _) = unsafe { self.end_unchecked()? }; @@ -128,7 +128,7 @@ impl RecordingCommandBuffer { } } -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Allocates and begins recording a new secondary command buffer. #[inline] pub fn secondary( @@ -136,7 +136,7 @@ impl RecordingCommandBuffer { queue_family_index: u32, usage: CommandBufferUsage, inheritance_info: CommandBufferInheritanceInfo, - ) -> Result, Validated> { + ) -> Result, Validated> { unsafe { Self::new( allocator, @@ -158,7 +158,7 @@ impl RecordingCommandBuffer { queue_family_index: u32, usage: CommandBufferUsage, inheritance_info: CommandBufferInheritanceInfo, - ) -> Result, Validated> { + ) -> Result, Validated> { unsafe { Self::new_unchecked( allocator, @@ -174,7 +174,7 @@ impl RecordingCommandBuffer { } /// Ends the recording, returning a command buffer which can be submitted. - pub fn end(self) -> Result, Validated> { + pub fn build(self) -> Result, Validated> { self.validate_end()?; let (inner, keep_alive_objects, _, resources_usage) = unsafe { self.end_unchecked()? }; @@ -198,7 +198,7 @@ impl RecordingCommandBuffer { } } -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { unsafe fn new( allocator: Arc, queue_family_index: u32, @@ -216,7 +216,7 @@ impl RecordingCommandBuffer { level: CommandBufferLevel, begin_info: &CommandBufferBeginInfo, ) -> Result<(), Box> { - RawRecordingCommandBuffer::validate_new(device, queue_family_index, level, begin_info)?; + RecordingCommandBuffer::validate_new(device, queue_family_index, level, begin_info)?; Ok(()) } @@ -248,14 +248,14 @@ impl RecordingCommandBuffer { } } - let inner = RawRecordingCommandBuffer::new_unchecked( + let inner = RecordingCommandBuffer::new_unchecked( allocator, queue_family_index, level, begin_info, )?; - Ok(RecordingCommandBuffer { + Ok(AutoCommandBufferBuilder { inner, commands: Vec::new(), builder_state, @@ -292,8 +292,8 @@ impl RecordingCommandBuffer { mut self, ) -> Result< ( - RawCommandBuffer, - Vec>, + CommandBuffer, + Vec>, CommandBufferResourcesUsage, SecondaryCommandBufferResourcesUsage, ), @@ -381,12 +381,12 @@ impl RecordingCommandBuffer { } } -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { pub(in crate::command_buffer) fn add_command( &mut self, name: &'static str, used_resources: Vec<(ResourceUseRef2, Resource)>, - record_func: impl Fn(&mut RawRecordingCommandBuffer) + Send + Sync + 'static, + record_func: impl Fn(&mut RecordingCommandBuffer) + Send + Sync + 'static, ) { self.commands.push(( CommandInfo { @@ -402,7 +402,7 @@ impl RecordingCommandBuffer { &mut self, name: &'static str, used_resources: Vec<(ResourceUseRef2, Resource)>, - record_func: impl Fn(&mut RawRecordingCommandBuffer) + Send + Sync + 'static, + record_func: impl Fn(&mut RecordingCommandBuffer) + Send + Sync + 'static, ) { self.commands.push(( CommandInfo { @@ -418,7 +418,7 @@ impl RecordingCommandBuffer { &mut self, name: &'static str, used_resources: Vec<(ResourceUseRef2, Resource)>, - record_func: impl Fn(&mut RawRecordingCommandBuffer) + Send + Sync + 'static, + record_func: impl Fn(&mut RecordingCommandBuffer) + Send + Sync + 'static, ) { self.commands.push(( CommandInfo { @@ -431,7 +431,7 @@ impl RecordingCommandBuffer { } } -unsafe impl DeviceOwned for RecordingCommandBuffer { +unsafe impl DeviceOwned for AutoCommandBufferBuilder { #[inline] fn device(&self) -> &Arc { self.inner.device() diff --git a/vulkano/src/command_buffer/auto/mod.rs b/vulkano/src/command_buffer/auto/mod.rs index 599fcad8..f4144529 100644 --- a/vulkano/src/command_buffer/auto/mod.rs +++ b/vulkano/src/command_buffer/auto/mod.rs @@ -63,7 +63,7 @@ pub(in crate::command_buffer) use self::builder::{ RenderPassStateAttachments, RenderPassStateType, SetOrPush, }; use super::{ - sys::{RawCommandBuffer, RawRecordingCommandBuffer}, + sys::{CommandBuffer, RecordingCommandBuffer}, CommandBufferInheritanceInfo, CommandBufferResourcesUsage, CommandBufferState, CommandBufferUsage, ResourceInCommand, SecondaryCommandBufferResourcesUsage, SecondaryResourceUseRef, @@ -88,8 +88,8 @@ use std::{ mod builder; pub struct PrimaryAutoCommandBuffer { - inner: RawCommandBuffer, - _keep_alive_objects: Vec>, + inner: CommandBuffer, + _keep_alive_objects: Vec>, resources_usage: CommandBufferResourcesUsage, state: Mutex, } @@ -121,7 +121,7 @@ impl Debug for PrimaryAutoCommandBuffer { impl PrimaryAutoCommandBuffer { /// Returns the inner raw command buffer. #[inline] - pub fn inner(&self) -> &RawCommandBuffer { + pub fn inner(&self) -> &CommandBuffer { &self.inner } @@ -147,8 +147,8 @@ impl PrimaryAutoCommandBuffer { } pub struct SecondaryAutoCommandBuffer { - inner: RawCommandBuffer, - _keep_alive_objects: Vec>, + inner: CommandBuffer, + _keep_alive_objects: Vec>, resources_usage: SecondaryCommandBufferResourcesUsage, submit_state: SubmitState, } @@ -180,7 +180,7 @@ impl Debug for SecondaryAutoCommandBuffer { impl SecondaryAutoCommandBuffer { /// Returns the inner raw command buffer. #[inline] - pub fn inner(&self) -> &RawCommandBuffer { + pub fn inner(&self) -> &CommandBuffer { &self.inner } @@ -346,7 +346,7 @@ mod tests { buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ allocator::{StandardCommandBufferAllocator, StandardCommandBufferAllocatorCreateInfo}, - BufferCopy, CommandBufferUsage, CopyBufferInfoTyped, RecordingCommandBuffer, + AutoCommandBufferBuilder, BufferCopy, CommandBufferUsage, CopyBufferInfoTyped, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, @@ -374,7 +374,7 @@ mod tests { Default::default(), )); - RecordingCommandBuffer::primary( + AutoCommandBufferBuilder::primary( allocator, queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -440,7 +440,7 @@ mod tests { device, Default::default(), )); - let mut cbb = RecordingCommandBuffer::primary( + let mut cbb = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -459,7 +459,7 @@ mod tests { }) .unwrap(); - let cb = cbb.end().unwrap(); + let cb = cbb.build().unwrap(); let future = cb .execute(queue) @@ -486,17 +486,17 @@ mod tests { )); // Make a secondary CB that doesn't support simultaneous use. - let builder = RecordingCommandBuffer::secondary( + let builder = AutoCommandBufferBuilder::secondary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, Default::default(), ) .unwrap(); - let secondary = builder.end().unwrap(); + let secondary = builder.build().unwrap(); { - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, @@ -512,16 +512,16 @@ mod tests { } { - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, ) .unwrap(); builder.execute_commands(secondary.clone()).unwrap(); - let cb1 = builder.end().unwrap(); + let cb1 = builder.build().unwrap(); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, @@ -563,7 +563,7 @@ mod tests { device, Default::default(), )); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -583,7 +583,7 @@ mod tests { }) .unwrap(); - let cb = builder.end().unwrap(); + let cb = builder.build().unwrap(); let future = cb .execute(queue) @@ -621,7 +621,7 @@ mod tests { device, Default::default(), )); - let mut builder = RecordingCommandBuffer::primary( + let mut builder = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -654,7 +654,7 @@ mod tests { ..Default::default() }, )); - let cbb = RecordingCommandBuffer::primary( + let cbb = AutoCommandBufferBuilder::primary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -678,7 +678,7 @@ mod tests { ) .unwrap(); - cbb.end() + cbb.build() .unwrap() .execute(queue.clone()) .unwrap() @@ -690,7 +690,7 @@ mod tests { // Two secondary command buffers that both write to the buffer let secondary = (0..2) .map(|_| { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, @@ -700,12 +700,12 @@ mod tests { builder .fill_buffer(buffer.clone().into_slice(), 42) .unwrap(); - builder.end().unwrap() + builder.build().unwrap() }) .collect::>(); { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( cb_allocator.clone(), queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, @@ -718,7 +718,7 @@ mod tests { builder.execute_commands_unchecked([secondary as _].into_iter().collect()); }); - let _primary = builder.end().unwrap(); + let _primary = builder.build().unwrap(); /* let names = primary._commands.iter().map(|c| c.name).collect::>(); @@ -729,7 +729,7 @@ mod tests { } { - let mut builder = RecordingCommandBuffer::secondary( + let mut builder = AutoCommandBufferBuilder::secondary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::SimultaneousUse, @@ -757,7 +757,7 @@ mod tests { device.clone(), Default::default(), )); - let mut sync = RecordingCommandBuffer::primary( + let mut sync = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, @@ -796,7 +796,7 @@ mod tests { device.clone(), Default::default(), )); - let mut sync = RecordingCommandBuffer::primary( + let mut sync = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::MultipleSubmit, diff --git a/vulkano/src/command_buffer/commands/acceleration_structure.rs b/vulkano/src/command_buffer/commands/acceleration_structure.rs index 5cc2afa8..84b59dd9 100644 --- a/vulkano/src/command_buffer/commands/acceleration_structure.rs +++ b/vulkano/src/command_buffer/commands/acceleration_structure.rs @@ -12,8 +12,8 @@ use crate::{ buffer::{BufferUsage, Subbuffer}, command_buffer::{ auto::{Resource, ResourceUseRef2}, - sys::RawRecordingCommandBuffer, - RecordingCommandBuffer, ResourceInCommand, + sys::RecordingCommandBuffer, + AutoCommandBufferBuilder, ResourceInCommand, }, device::{DeviceOwned, QueueFlags}, query::{QueryPool, QueryType}, @@ -24,7 +24,7 @@ use smallvec::SmallVec; use std::{mem::size_of, sync::Arc}; /// # Commands to do operations on acceleration structures. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Builds or updates an acceleration structure. /// /// # Safety @@ -118,7 +118,7 @@ impl RecordingCommandBuffer { self.add_command( "build_acceleration_structure", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.build_acceleration_structure_unchecked(&info, &build_range_infos); }, ); @@ -247,7 +247,7 @@ impl RecordingCommandBuffer { self.add_command( "build_acceleration_structure_indirect", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.build_acceleration_structure_indirect_unchecked( &info, &indirect_buffer, @@ -336,7 +336,7 @@ impl RecordingCommandBuffer { ] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_acceleration_structure_unchecked(&info); }, ); @@ -420,7 +420,7 @@ impl RecordingCommandBuffer { ] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_acceleration_structure_to_memory_unchecked(&info); }, ); @@ -507,7 +507,7 @@ impl RecordingCommandBuffer { ] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_memory_to_acceleration_structure_unchecked(&info); }, ); @@ -603,7 +603,7 @@ impl RecordingCommandBuffer { }, ) }).collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.write_acceleration_structures_properties_unchecked( &acceleration_structures, &query_pool, @@ -790,7 +790,7 @@ fn add_indirect_buffer_resources( )); } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn build_acceleration_structure( &mut self, diff --git a/vulkano/src/command_buffer/commands/bind_push.rs b/vulkano/src/command_buffer/commands/bind_push.rs index 6d4bb34e..561f8f1a 100644 --- a/vulkano/src/command_buffer/commands/bind_push.rs +++ b/vulkano/src/command_buffer/commands/bind_push.rs @@ -1,6 +1,6 @@ use crate::{ buffer::{BufferContents, BufferUsage, IndexBuffer, Subbuffer}, - command_buffer::{auto::SetOrPush, sys::RawRecordingCommandBuffer, RecordingCommandBuffer}, + command_buffer::{auto::SetOrPush, sys::RecordingCommandBuffer, AutoCommandBufferBuilder}, descriptor_set::{ layout::{DescriptorBindingFlags, DescriptorSetLayoutCreateFlags, DescriptorType}, DescriptorBindingResources, DescriptorBufferInfo, DescriptorSetResources, @@ -20,7 +20,7 @@ use std::{cmp::min, ffi::c_void, mem::size_of, ptr, sync::Arc}; /// # Commands to bind or push state for pipeline execution commands. /// /// These commands require a queue with a pipeline type that uses the given state. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Binds descriptor sets for future dispatch or draw calls. pub fn bind_descriptor_sets( &mut self, @@ -94,7 +94,7 @@ impl RecordingCommandBuffer { self.add_command( "bind_descriptor_sets", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.bind_descriptor_sets_unchecked( pipeline_bind_point, &pipeline_layout, @@ -137,7 +137,7 @@ impl RecordingCommandBuffer { self.add_command( "bind_index_buffer", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.bind_index_buffer_unchecked(&index_buffer); }, ); @@ -173,7 +173,7 @@ impl RecordingCommandBuffer { self.add_command( "bind_pipeline_compute", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.bind_pipeline_compute_unchecked(&pipeline); }, ); @@ -216,7 +216,7 @@ impl RecordingCommandBuffer { self.add_command( "bind_pipeline_graphics", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.bind_pipeline_graphics_unchecked(&pipeline); }, ); @@ -264,7 +264,7 @@ impl RecordingCommandBuffer { self.add_command( "bind_vertex_buffers", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.bind_vertex_buffers_unchecked(first_binding, &vertex_buffers); }, ); @@ -328,7 +328,7 @@ impl RecordingCommandBuffer { self.add_command( "push_constants", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.push_constants_unchecked(&pipeline_layout, offset, &push_constants); }, ); @@ -413,7 +413,7 @@ impl RecordingCommandBuffer { self.add_command( "push_descriptor_set", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.push_descriptor_set_unchecked( pipeline_bind_point, &pipeline_layout, @@ -427,7 +427,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn bind_descriptor_sets( &mut self, diff --git a/vulkano/src/command_buffer/commands/clear.rs b/vulkano/src/command_buffer/commands/clear.rs index b9dbabb0..d55126bc 100644 --- a/vulkano/src/command_buffer/commands/clear.rs +++ b/vulkano/src/command_buffer/commands/clear.rs @@ -1,7 +1,7 @@ use crate::{ buffer::{BufferContents, BufferUsage, Subbuffer}, command_buffer::{ - auto::Resource, sys::RawRecordingCommandBuffer, RecordingCommandBuffer, ResourceInCommand, + auto::Resource, sys::RecordingCommandBuffer, AutoCommandBufferBuilder, ResourceInCommand, }, device::{Device, DeviceOwned, QueueFlags}, format::{ClearColorValue, ClearDepthStencilValue, FormatFeatures}, @@ -14,7 +14,7 @@ use smallvec::{smallvec, SmallVec}; use std::{mem::size_of_val, sync::Arc}; /// # Commands to fill resources with new data. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Clears a color image with a specific value. pub fn clear_color_image( &mut self, @@ -73,7 +73,7 @@ impl RecordingCommandBuffer { )] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.clear_color_image_unchecked(&clear_info); }, ); @@ -139,7 +139,7 @@ impl RecordingCommandBuffer { )] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.clear_depth_stencil_image_unchecked(&clear_info); }, ); @@ -197,7 +197,7 @@ impl RecordingCommandBuffer { )] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.fill_buffer_unchecked(&dst_buffer, data); }, ); @@ -263,7 +263,7 @@ impl RecordingCommandBuffer { )] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.update_buffer_unchecked(&dst_buffer, &data); }, ); @@ -272,7 +272,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn clear_color_image( &mut self, diff --git a/vulkano/src/command_buffer/commands/copy.rs b/vulkano/src/command_buffer/commands/copy.rs index be745c77..a2c2262f 100644 --- a/vulkano/src/command_buffer/commands/copy.rs +++ b/vulkano/src/command_buffer/commands/copy.rs @@ -1,7 +1,7 @@ use crate::{ buffer::{BufferUsage, Subbuffer}, command_buffer::{ - auto::Resource, sys::RawRecordingCommandBuffer, RecordingCommandBuffer, ResourceInCommand, + auto::Resource, sys::RecordingCommandBuffer, AutoCommandBufferBuilder, ResourceInCommand, }, device::{Device, DeviceOwned, QueueFlags}, format::{Format, FormatFeatures}, @@ -20,7 +20,7 @@ use std::{ }; /// # Commands to transfer data between resources. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Copies data from a buffer to another buffer. /// /// # Panics @@ -98,7 +98,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_buffer_unchecked(©_buffer_info); }, ); @@ -200,7 +200,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_image_unchecked(©_image_info); }, ); @@ -287,7 +287,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_buffer_to_image_unchecked(©_buffer_to_image_info); }, ); @@ -374,7 +374,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_image_to_buffer_unchecked(©_image_to_buffer_info); }, ); @@ -487,7 +487,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.blit_image_unchecked(&blit_image_info); }, ); @@ -578,7 +578,7 @@ impl RecordingCommandBuffer { ] }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.resolve_image_unchecked(&resolve_image_info); }, ); @@ -587,7 +587,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn copy_buffer( &mut self, diff --git a/vulkano/src/command_buffer/commands/debug.rs b/vulkano/src/command_buffer/commands/debug.rs index 5dee1451..e86e4c5e 100644 --- a/vulkano/src/command_buffer/commands/debug.rs +++ b/vulkano/src/command_buffer/commands/debug.rs @@ -1,5 +1,5 @@ use crate::{ - command_buffer::{sys::RawRecordingCommandBuffer, RecordingCommandBuffer}, + command_buffer::{sys::RecordingCommandBuffer, AutoCommandBufferBuilder}, device::{DeviceOwned, QueueFlags}, instance::debug::DebugUtilsLabel, Requires, RequiresAllOf, RequiresOneOf, ValidationError, VulkanObject, @@ -10,7 +10,7 @@ use crate::{ /// These commands all require the [`ext_debug_utils`] extension to be enabled on the instance. /// /// [`ext_debug_utils`]: crate::instance::InstanceExtensions::ext_debug_utils -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Opens a command buffer debug label region. pub fn begin_debug_utils_label( &mut self, @@ -38,7 +38,7 @@ impl RecordingCommandBuffer { self.add_command( "begin_debug_utils_label", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.begin_debug_utils_label_unchecked(&label_info); }, ); @@ -74,7 +74,7 @@ impl RecordingCommandBuffer { self.add_command( "end_debug_utils_label", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.end_debug_utils_label_unchecked(); }, ); @@ -109,7 +109,7 @@ impl RecordingCommandBuffer { self.add_command( "insert_debug_utils_label", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.insert_debug_utils_label_unchecked(&label_info); }, ); @@ -118,7 +118,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn begin_debug_utils_label( &mut self, diff --git a/vulkano/src/command_buffer/commands/dynamic_state.rs b/vulkano/src/command_buffer/commands/dynamic_state.rs index 4d13b29f..75cf96fe 100644 --- a/vulkano/src/command_buffer/commands/dynamic_state.rs +++ b/vulkano/src/command_buffer/commands/dynamic_state.rs @@ -1,5 +1,5 @@ use crate::{ - command_buffer::{sys::RawRecordingCommandBuffer, RecordingCommandBuffer}, + command_buffer::{sys::RecordingCommandBuffer, AutoCommandBufferBuilder}, device::{DeviceOwned, QueueFlags}, pipeline::{ graphics::{ @@ -23,7 +23,7 @@ use std::ops::RangeInclusive; /// # Commands to set dynamic state for pipelines. /// /// These commands require a queue with a pipeline type that uses the given state. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { // Helper function for dynamic state setting. fn validate_graphics_pipeline_fixed_state( &self, @@ -74,7 +74,7 @@ impl RecordingCommandBuffer { self.add_command( "set_blend_constants", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_blend_constants_unchecked(constants); }, ); @@ -131,7 +131,7 @@ impl RecordingCommandBuffer { self.add_command( "set_color_write_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_color_write_enable_unchecked(&enables); }, ); @@ -163,7 +163,7 @@ impl RecordingCommandBuffer { self.add_command( "set_cull_mode", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_cull_mode_unchecked(cull_mode); }, ); @@ -212,7 +212,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_bias", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_bias_unchecked(constant_factor, clamp, slope_factor); }, ); @@ -244,7 +244,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_bias_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_bias_enable_unchecked(enable); }, ); @@ -279,7 +279,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_bounds", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_bounds_unchecked(bounds.clone()); }, ); @@ -314,7 +314,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_bounds_test_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_bounds_test_enable_unchecked(enable); }, ); @@ -349,7 +349,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_compare_op", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_compare_op_unchecked(compare_op); }, ); @@ -381,7 +381,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_test_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_test_enable_unchecked(enable); }, ); @@ -413,7 +413,7 @@ impl RecordingCommandBuffer { self.add_command( "set_depth_write_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_depth_write_enable_unchecked(enable); }, ); @@ -459,7 +459,7 @@ impl RecordingCommandBuffer { self.add_command( "set_discard_rectangle", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_discard_rectangle_unchecked(first_rectangle, &rectangles); }, ); @@ -488,7 +488,7 @@ impl RecordingCommandBuffer { self.add_command( "set_front_face", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_front_face_unchecked(face); }, ); @@ -525,7 +525,7 @@ impl RecordingCommandBuffer { self.add_command( "set_line_stipple", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_line_stipple_unchecked(factor, pattern); }, ); @@ -554,7 +554,7 @@ impl RecordingCommandBuffer { self.add_command( "set_line_width", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_line_width_unchecked(line_width); }, ); @@ -583,7 +583,7 @@ impl RecordingCommandBuffer { self.add_command( "set_logic_op", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_logic_op_unchecked(logic_op); }, ); @@ -615,7 +615,7 @@ impl RecordingCommandBuffer { self.add_command( "set_patch_control_points", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_patch_control_points_unchecked(num); }, ); @@ -650,7 +650,7 @@ impl RecordingCommandBuffer { self.add_command( "set_primitive_restart_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_primitive_restart_enable_unchecked(enable); }, ); @@ -688,7 +688,7 @@ impl RecordingCommandBuffer { self.add_command( "set_primitive_topology", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_primitive_topology_unchecked(topology); }, ); @@ -723,7 +723,7 @@ impl RecordingCommandBuffer { self.add_command( "set_rasterizer_discard_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_rasterizer_discard_enable_unchecked(enable); }, ); @@ -770,7 +770,7 @@ impl RecordingCommandBuffer { self.add_command( "set_scissor", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_scissor_unchecked(first_scissor, &scissors); }, ); @@ -808,7 +808,7 @@ impl RecordingCommandBuffer { self.add_command( "set_scissor_with_count", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_scissor_with_count_unchecked(&scissors); }, ); @@ -859,7 +859,7 @@ impl RecordingCommandBuffer { self.add_command( "set_stencil_compare_mask", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_stencil_compare_mask_unchecked(faces, compare_mask); }, ); @@ -931,7 +931,7 @@ impl RecordingCommandBuffer { self.add_command( "set_stencil_op", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_stencil_op_unchecked(faces, fail_op, pass_op, depth_fail_op, compare_op); }, ); @@ -982,7 +982,7 @@ impl RecordingCommandBuffer { self.add_command( "set_stencil_reference", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_stencil_reference_unchecked(faces, reference); }, ); @@ -1014,7 +1014,7 @@ impl RecordingCommandBuffer { self.add_command( "set_stencil_test_enable", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_stencil_test_enable_unchecked(enable); }, ); @@ -1065,7 +1065,7 @@ impl RecordingCommandBuffer { self.add_command( "set_stencil_write_mask", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_stencil_write_mask_unchecked(faces, write_mask); }, ); @@ -1105,7 +1105,7 @@ impl RecordingCommandBuffer { self.add_command( "set_vertex_input", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_vertex_input_unchecked(&vertex_input_state); }, ); @@ -1151,7 +1151,7 @@ impl RecordingCommandBuffer { self.add_command( "set_viewport", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_viewport_unchecked(first_viewport, &viewports); }, ); @@ -1189,7 +1189,7 @@ impl RecordingCommandBuffer { self.add_command( "set_viewport", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_viewport_with_count_unchecked(&viewports); }, ); @@ -1228,7 +1228,7 @@ impl RecordingCommandBuffer { self.add_command( "set_conservative_rasterization_mode", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_conservative_rasterization_mode_unchecked(conservative_rasterization_mode); }, ); @@ -1272,7 +1272,7 @@ impl RecordingCommandBuffer { self.add_command( "set_extra_primitive_overestimation_size", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.set_extra_primitive_overestimation_size_unchecked( extra_primitive_overestimation_size, ); @@ -1331,7 +1331,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn set_blend_constants( &mut self, diff --git a/vulkano/src/command_buffer/commands/pipeline.rs b/vulkano/src/command_buffer/commands/pipeline.rs index 17784c91..9cc392a4 100644 --- a/vulkano/src/command_buffer/commands/pipeline.rs +++ b/vulkano/src/command_buffer/commands/pipeline.rs @@ -5,9 +5,9 @@ use crate::{ buffer::{view::BufferView, BufferUsage, Subbuffer}, command_buffer::{ auto::{RenderPassState, RenderPassStateType, Resource, ResourceUseRef2}, - sys::RawRecordingCommandBuffer, - DispatchIndirectCommand, DrawIndexedIndirectCommand, DrawIndirectCommand, - DrawMeshTasksIndirectCommand, RecordingCommandBuffer, ResourceInCommand, SubpassContents, + sys::RecordingCommandBuffer, + AutoCommandBufferBuilder, DispatchIndirectCommand, DrawIndexedIndirectCommand, + DrawIndirectCommand, DrawMeshTasksIndirectCommand, ResourceInCommand, SubpassContents, }, descriptor_set::{ layout::{DescriptorBindingFlags, DescriptorType}, @@ -52,7 +52,7 @@ macro_rules! vuids { /// # Commands to execute a bound pipeline. /// /// Dispatch commands require a compute queue, draw commands require a graphics queue. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Perform a single compute operation using a compute pipeline. /// /// A compute pipeline must have been bound using @@ -117,7 +117,7 @@ impl RecordingCommandBuffer { self.add_command( "dispatch", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.dispatch_unchecked(group_counts); }, ); @@ -199,7 +199,7 @@ impl RecordingCommandBuffer { self.add_command( "dispatch", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.dispatch_indirect_unchecked(&indirect_buffer); }, ); @@ -386,7 +386,7 @@ impl RecordingCommandBuffer { self.add_command( "draw", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_unchecked(vertex_count, instance_count, first_vertex, first_instance); }, ); @@ -493,7 +493,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_indirect", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_indirect_unchecked(&indirect_buffer, draw_count, stride); }, ); @@ -623,7 +623,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_indirect_count", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_indirect_count_unchecked( &indirect_buffer, &count_buffer, @@ -860,7 +860,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_indexed", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_indexed_unchecked( index_count, instance_count, @@ -989,7 +989,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_indexed_indirect", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_indexed_indirect_unchecked(&indirect_buffer, draw_count, stride); }, ); @@ -1134,7 +1134,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_indexed_indirect_count", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_indexed_indirect_count_unchecked( &indirect_buffer, &count_buffer, @@ -1326,7 +1326,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_mesh_tasks", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_mesh_tasks_unchecked(group_counts); }, ); @@ -1441,7 +1441,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_mesh_tasks_indirect", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_mesh_tasks_indirect_unchecked(&indirect_buffer, draw_count, stride); }, ); @@ -1579,7 +1579,7 @@ impl RecordingCommandBuffer { self.add_command( "draw_mesh_tasks_indirect_count", used_resources, - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.draw_mesh_tasks_indirect_count_unchecked( &indirect_buffer, &count_buffer, @@ -3716,7 +3716,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn dispatch( &mut self, diff --git a/vulkano/src/command_buffer/commands/query.rs b/vulkano/src/command_buffer/commands/query.rs index aa6f8488..e2c80ea2 100644 --- a/vulkano/src/command_buffer/commands/query.rs +++ b/vulkano/src/command_buffer/commands/query.rs @@ -2,8 +2,8 @@ use crate::{ buffer::{BufferUsage, Subbuffer}, command_buffer::{ auto::{QueryState, Resource}, - sys::RawRecordingCommandBuffer, - RecordingCommandBuffer, ResourceInCommand, + sys::RecordingCommandBuffer, + AutoCommandBufferBuilder, ResourceInCommand, }, device::{DeviceOwned, QueueFlags}, query::{QueryControlFlags, QueryPool, QueryResultElement, QueryResultFlags, QueryType}, @@ -13,7 +13,7 @@ use crate::{ use std::{ops::Range, sync::Arc}; /// # Commands related to queries. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Begins a query. /// /// The query will be active until [`end_query`](Self::end_query) is called for the same query. @@ -97,7 +97,7 @@ impl RecordingCommandBuffer { self.add_command( "begin_query", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.begin_query_unchecked(&query_pool, query, flags); }, ); @@ -168,7 +168,7 @@ impl RecordingCommandBuffer { self.add_command( "end_query", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.end_query_unchecked(&query_pool, query); }, ); @@ -235,7 +235,7 @@ impl RecordingCommandBuffer { self.add_command( "write_timestamp", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.write_timestamp_unchecked(&query_pool, query, stage); }, ); @@ -317,7 +317,7 @@ impl RecordingCommandBuffer { )] .into_iter() .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.copy_query_pool_results_unchecked( &query_pool, queries.clone(), @@ -389,7 +389,7 @@ impl RecordingCommandBuffer { self.add_command( "reset_query_pool", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.reset_query_pool_unchecked(&query_pool, queries.clone()); }, ); @@ -398,7 +398,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn begin_query( &mut self, diff --git a/vulkano/src/command_buffer/commands/render_pass.rs b/vulkano/src/command_buffer/commands/render_pass.rs index 11a62c1f..1235a8d6 100644 --- a/vulkano/src/command_buffer/commands/render_pass.rs +++ b/vulkano/src/command_buffer/commands/render_pass.rs @@ -4,8 +4,8 @@ use crate::{ BeginRenderPassState, BeginRenderingState, RenderPassState, RenderPassStateAttachments, RenderPassStateType, Resource, }, - sys::RawRecordingCommandBuffer, - CommandBufferLevel, RecordingCommandBuffer, ResourceInCommand, SubpassContents, + sys::RecordingCommandBuffer, + AutoCommandBufferBuilder, CommandBufferLevel, ResourceInCommand, SubpassContents, }, device::{Device, DeviceOwned, QueueFlags}, format::{ClearColorValue, ClearValue, NumericType}, @@ -24,7 +24,7 @@ use std::{cmp::min, ops::Range, sync::Arc}; /// # Commands for render passes. /// /// These commands require a graphics queue. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Begins a render pass using a render pass object and framebuffer. /// /// You must call this or `begin_rendering` before you can record draw commands. @@ -138,7 +138,7 @@ impl RecordingCommandBuffer { ) }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.begin_render_pass_unchecked(&render_pass_begin_info, &subpass_begin_info); }, ); @@ -240,7 +240,7 @@ impl RecordingCommandBuffer { self.add_command( "next_subpass", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.next_subpass_unchecked(&subpass_end_info, &subpass_begin_info); }, ); @@ -321,7 +321,7 @@ impl RecordingCommandBuffer { self.add_render_pass_end( "end_render_pass", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.end_render_pass_unchecked(&subpass_end_info); }, ); @@ -561,7 +561,7 @@ impl RecordingCommandBuffer { .flatten() })) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.begin_rendering_unchecked(&rendering_info); }, ); @@ -628,7 +628,7 @@ impl RecordingCommandBuffer { self.add_render_pass_end( "end_rendering", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.end_rendering_unchecked(); }, ); @@ -880,7 +880,7 @@ impl RecordingCommandBuffer { self.add_command( "clear_attachments", Default::default(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.clear_attachments_unchecked(&attachments, &rects); }, ); @@ -889,7 +889,7 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn begin_render_pass( &mut self, @@ -3189,7 +3189,7 @@ impl RenderingAttachmentResolveInfo { /// Clear attachment type, used in [`clear_attachments`] command. /// -/// [`clear_attachments`]: RecordingCommandBuffer::clear_attachments +/// [`clear_attachments`]: AutoCommandBufferBuilder::clear_attachments #[derive(Clone, Copy, Debug)] pub enum ClearAttachment { /// Clear the color attachment at the specified index, with the specified clear value. @@ -3273,7 +3273,7 @@ impl ClearAttachment { /// Specifies the clear region for the [`clear_attachments`] command. /// -/// [`clear_attachments`]: RecordingCommandBuffer::clear_attachments +/// [`clear_attachments`]: AutoCommandBufferBuilder::clear_attachments #[derive(Clone, Debug, PartialEq, Eq)] pub struct ClearRect { /// The rectangle offset. diff --git a/vulkano/src/command_buffer/commands/secondary.rs b/vulkano/src/command_buffer/commands/secondary.rs index 9c4ff157..b33b9887 100644 --- a/vulkano/src/command_buffer/commands/secondary.rs +++ b/vulkano/src/command_buffer/commands/secondary.rs @@ -1,8 +1,8 @@ use crate::{ command_buffer::{ auto::{RenderPassStateType, Resource, ResourceUseRef2}, - sys::{RawCommandBuffer, RawRecordingCommandBuffer}, - CommandBufferInheritanceRenderPassType, CommandBufferLevel, RecordingCommandBuffer, + sys::{CommandBuffer, RecordingCommandBuffer}, + AutoCommandBufferBuilder, CommandBufferInheritanceRenderPassType, CommandBufferLevel, ResourceInCommand, SecondaryAutoCommandBuffer, SecondaryCommandBufferBufferUsage, SecondaryCommandBufferImageUsage, SecondaryCommandBufferResourcesUsage, SubpassContents, }, @@ -17,7 +17,7 @@ use std::{cmp::min, iter, sync::Arc}; /// /// These commands can be called on any queue that can execute the commands recorded in the /// secondary command buffer. -impl RecordingCommandBuffer { +impl AutoCommandBufferBuilder { /// Executes a secondary command buffer. /// /// If the `flags` that `command_buffer` was created with are more restrictive than those of @@ -537,7 +537,7 @@ impl RecordingCommandBuffer { })) }) .collect(), - move |out: &mut RawRecordingCommandBuffer| { + move |out: &mut RecordingCommandBuffer| { out.execute_commands_locked(&command_buffers); }, ); @@ -546,11 +546,11 @@ impl RecordingCommandBuffer { } } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn execute_commands( &mut self, - command_buffers: &[&RawCommandBuffer], + command_buffers: &[&CommandBuffer], ) -> Result<&mut Self, Box> { self.validate_execute_commands(command_buffers.iter().copied())?; @@ -559,7 +559,7 @@ impl RawRecordingCommandBuffer { fn validate_execute_commands<'a>( &self, - command_buffers: impl Iterator, + command_buffers: impl Iterator, ) -> Result<(), Box> { if self.level() != CommandBufferLevel::Primary { return Err(Box::new(ValidationError { @@ -615,7 +615,7 @@ impl RawRecordingCommandBuffer { #[cfg_attr(not(feature = "document_unchecked"), doc(hidden))] pub unsafe fn execute_commands_unchecked( &mut self, - command_buffers: &[&RawCommandBuffer], + command_buffers: &[&CommandBuffer], ) -> &mut Self { if command_buffers.is_empty() { return self; diff --git a/vulkano/src/command_buffer/commands/sync.rs b/vulkano/src/command_buffer/commands/sync.rs index e56d33b1..525908c3 100644 --- a/vulkano/src/command_buffer/commands/sync.rs +++ b/vulkano/src/command_buffer/commands/sync.rs @@ -1,5 +1,5 @@ use crate::{ - command_buffer::sys::RawRecordingCommandBuffer, + command_buffer::sys::RecordingCommandBuffer, device::{DeviceOwned, QueueFlags}, sync::{ event::Event, BufferMemoryBarrier, DependencyInfo, DependencyInfo2Fields1Vk, @@ -10,7 +10,7 @@ use crate::{ use smallvec::SmallVec; use std::sync::Arc; -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { #[inline] pub unsafe fn pipeline_barrier( &mut self, diff --git a/vulkano/src/command_buffer/mod.rs b/vulkano/src/command_buffer/mod.rs index c437520c..deaae82f 100644 --- a/vulkano/src/command_buffer/mod.rs +++ b/vulkano/src/command_buffer/mod.rs @@ -39,8 +39,8 @@ //! # Recording a command buffer //! //! To record a new command buffer, the most direct way is to create a new -//! [`RecordingCommandBuffer`]. You can then call methods on this object to record new commands to -//! the command buffer. When you are done recording, you call [`end`] to finalise the command +//! [`AutoCommandBufferBuilder`]. You can then call methods on this object to record new commands +//! to the command buffer. When you are done recording, you call [`build`] to finalise the command //! buffer and turn it into either a [`PrimaryAutoCommandBuffer`] or a //! [`SecondaryAutoCommandBuffer`]. //! @@ -52,7 +52,7 @@ //! on the GPU. //! //! ``` -//! use vulkano::command_buffer::{CommandBufferUsage, RecordingCommandBuffer, SubpassContents}; +//! use vulkano::command_buffer::{AutoCommandBufferBuilder, CommandBufferUsage, SubpassContents}; //! //! # let device: std::sync::Arc = return; //! # let queue: std::sync::Arc = return; @@ -61,7 +61,7 @@ //! # let graphics_pipeline: std::sync::Arc = return; //! # let command_buffer_allocator: std::sync::Arc = return; //! # -//! let mut cb = RecordingCommandBuffer::primary( +//! let mut cb = AutoCommandBufferBuilder::primary( //! command_buffer_allocator.clone(), //! queue.queue_family_index(), //! CommandBufferUsage::OneTimeSubmit, @@ -81,7 +81,7 @@ //! //! cb.end_render_pass(Default::default()).unwrap(); //! -//! let cb = cb.end().unwrap(); +//! let cb = cb.build().unwrap(); //! //! let future = cb.execute(queue.clone()); //! ``` @@ -89,7 +89,7 @@ //! [`StandardCommandBufferAllocator`]: allocator::StandardCommandBufferAllocator //! [`CommandBufferAllocator`]: allocator::CommandBufferAllocator //! [inherit]: CommandBufferInheritanceInfo -//! [`end`]: RecordingCommandBuffer::end +//! [`build`]: AutoCommandBufferBuilder::build //! [`GpuFuture`]: crate::sync::GpuFuture #[allow(unused_imports)] // everything is exported for future-proofing @@ -98,7 +98,8 @@ pub use self::commands::{ query::*, render_pass::*, secondary::*, sync::*, }; pub use self::{ - auto::{PrimaryAutoCommandBuffer, RecordingCommandBuffer, SecondaryAutoCommandBuffer}, + auto::{AutoCommandBufferBuilder, PrimaryAutoCommandBuffer, SecondaryAutoCommandBuffer}, + sys::{CommandBuffer, CommandBufferBeginInfo, RecordingCommandBuffer}, traits::{CommandBufferExecError, CommandBufferExecFuture}, }; use crate::{ @@ -130,11 +131,11 @@ pub mod allocator; pub mod auto; mod commands; pub mod pool; -pub mod sys; +mod sys; mod traits; /// Used as buffer contents to provide input for the -/// [`RecordingCommandBuffer::dispatch_indirect`] command. +/// [`AutoCommandBufferBuilder::dispatch_indirect`] command. /// /// # Safety /// @@ -150,7 +151,7 @@ pub struct DispatchIndirectCommand { } /// Used as buffer contents to provide input for the -/// [`RecordingCommandBuffer::draw_indirect`] command. +/// [`AutoCommandBufferBuilder::draw_indirect`] command. /// /// # Safety /// @@ -173,7 +174,7 @@ pub struct DrawIndirectCommand { } /// Used as buffer contents to provide input for the -/// [`RecordingCommandBuffer::draw_mesh_tasks_indirect`] command. +/// [`AutoCommandBufferBuilder::draw_mesh_tasks_indirect`] command. /// /// # Safety /// @@ -198,7 +199,7 @@ pub struct DrawMeshTasksIndirectCommand { } /// Used as buffer contents to provide input for the -/// [`RecordingCommandBuffer::draw_indexed_indirect`] command. +/// [`AutoCommandBufferBuilder::draw_indexed_indirect`] command. /// /// # Safety /// diff --git a/vulkano/src/command_buffer/sys.rs b/vulkano/src/command_buffer/sys.rs index d33da9cb..3ea6aa53 100644 --- a/vulkano/src/command_buffer/sys.rs +++ b/vulkano/src/command_buffer/sys.rs @@ -9,7 +9,7 @@ use crate::{ }; use std::{fmt::Debug, mem::ManuallyDrop, sync::Arc}; -/// A raw command buffer in the recording state. +/// A command buffer in the recording state. /// /// This type corresponds directly to a `VkCommandBuffer` after it has been allocated and started /// recording. It doesn't keep track of synchronization or resource lifetimes. As such, all @@ -19,7 +19,7 @@ use std::{fmt::Debug, mem::ManuallyDrop, sync::Arc}; /// /// Note that command buffers in the recording state don't implement the `Send` and `Sync` traits. /// Once a command buffer has finished recording, however, it *does* implement `Send` and `Sync`. -pub struct RawRecordingCommandBuffer { +pub struct RecordingCommandBuffer { allocation: ManuallyDrop, allocator: Arc, queue_family_index: u32, @@ -28,7 +28,7 @@ pub struct RawRecordingCommandBuffer { pub(super) usage: CommandBufferUsage, } -impl RawRecordingCommandBuffer { +impl RecordingCommandBuffer { /// Allocates and begins recording a new command buffer. #[inline] pub fn new( @@ -97,7 +97,7 @@ impl RawRecordingCommandBuffer { _ne: _, } = begin_info; - Ok(RawRecordingCommandBuffer { + Ok(RecordingCommandBuffer { allocation: ManuallyDrop::new(allocation), allocator, inheritance_info, @@ -108,13 +108,13 @@ impl RawRecordingCommandBuffer { /// Ends the recording, returning a command buffer which can be submitted. #[inline] - pub unsafe fn end(self) -> Result { + pub unsafe fn end(self) -> Result { let fns = self.device().fns(); (fns.v1_0.end_command_buffer)(self.handle()) .result() .map_err(VulkanError::from)?; - Ok(RawCommandBuffer { inner: self }) + Ok(CommandBuffer { inner: self }) } /// Returns the queue family index that this command buffer was created for. @@ -146,7 +146,7 @@ impl RawRecordingCommandBuffer { } } -impl Drop for RawRecordingCommandBuffer { +impl Drop for RecordingCommandBuffer { #[inline] fn drop(&mut self) { let allocation = unsafe { ManuallyDrop::take(&mut self.allocation) }; @@ -154,7 +154,7 @@ impl Drop for RawRecordingCommandBuffer { } } -unsafe impl VulkanObject for RawRecordingCommandBuffer { +unsafe impl VulkanObject for RecordingCommandBuffer { type Handle = ash::vk::CommandBuffer; #[inline] @@ -163,16 +163,16 @@ unsafe impl VulkanObject for RawRecordingCommandBuffer { } } -unsafe impl DeviceOwned for RawRecordingCommandBuffer { +unsafe impl DeviceOwned for RecordingCommandBuffer { #[inline] fn device(&self) -> &Arc { self.allocation.inner.device() } } -impl Debug for RawRecordingCommandBuffer { +impl Debug for RecordingCommandBuffer { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("RawRecordingCommandBuffer") + f.debug_struct("RecordingCommandBuffer") .field("handle", &self.level()) .field("level", &self.level()) .field("usage", &self.usage) @@ -328,22 +328,22 @@ pub(crate) struct BeginInfoFields2Vk { pub(crate) inheritance_info_fields1_vk: Option, } -/// A raw command buffer that has finished recording. +/// A command buffer that has finished recording. #[derive(Debug)] -pub struct RawCommandBuffer { - inner: RawRecordingCommandBuffer, +pub struct CommandBuffer { + inner: RecordingCommandBuffer, } -// `RawRecordingCommandBuffer` is `!Send + !Sync` so that the implementation of +// `RecordingCommandBuffer` is `!Send + !Sync` so that the implementation of // `CommandBufferAllocator::allocate` can assume that a command buffer in the recording state // doesn't leave the thread it was allocated on. However, as the safety contract states, // `CommandBufferAllocator::deallocate` must account for the possibility that a command buffer is // moved between threads after the recording is finished, and thus deallocated from another thread. // That's why this is sound. -unsafe impl Send for RawCommandBuffer {} -unsafe impl Sync for RawCommandBuffer {} +unsafe impl Send for CommandBuffer {} +unsafe impl Sync for CommandBuffer {} -impl RawCommandBuffer { +impl CommandBuffer { /// Returns the queue family index that this command buffer was created for. #[inline] pub fn queue_family_index(&self) -> u32 { @@ -369,7 +369,7 @@ impl RawCommandBuffer { } } -unsafe impl VulkanObject for RawCommandBuffer { +unsafe impl VulkanObject for CommandBuffer { type Handle = ash::vk::CommandBuffer; #[inline] @@ -378,7 +378,7 @@ unsafe impl VulkanObject for RawCommandBuffer { } } -unsafe impl DeviceOwned for RawCommandBuffer { +unsafe impl DeviceOwned for CommandBuffer { #[inline] fn device(&self) -> &Arc { self.inner.allocation.inner.device() diff --git a/vulkano/src/pipeline/compute.rs b/vulkano/src/pipeline/compute.rs index 2c639c59..2edf6ce6 100644 --- a/vulkano/src/pipeline/compute.rs +++ b/vulkano/src/pipeline/compute.rs @@ -433,7 +433,7 @@ mod tests { use crate::{ buffer::{Buffer, BufferCreateInfo, BufferUsage}, command_buffer::{ - allocator::StandardCommandBufferAllocator, CommandBufferUsage, RecordingCommandBuffer, + allocator::StandardCommandBufferAllocator, AutoCommandBufferBuilder, CommandBufferUsage, }, descriptor_set::{ allocator::StandardDescriptorSetAllocator, DescriptorSet, WriteDescriptorSet, @@ -544,7 +544,7 @@ mod tests { device.clone(), Default::default(), )); - let mut cbb = RecordingCommandBuffer::primary( + let mut cbb = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -565,7 +565,7 @@ mod tests { cbb.dispatch([1, 1, 1]).unwrap(); } - let cb = cbb.end().unwrap(); + let cb = cbb.build().unwrap(); let future = now(device) .then_execute(queue, cb) @@ -695,7 +695,7 @@ mod tests { device.clone(), Default::default(), )); - let mut cbb = RecordingCommandBuffer::primary( + let mut cbb = AutoCommandBufferBuilder::primary( cb_allocator, queue.queue_family_index(), CommandBufferUsage::OneTimeSubmit, @@ -716,7 +716,7 @@ mod tests { cbb.dispatch([128, 1, 1]).unwrap(); } - let cb = cbb.end().unwrap(); + let cb = cbb.build().unwrap(); let future = now(device) .then_execute(queue, cb) diff --git a/vulkano/src/pipeline/graphics/vertex_input/mod.rs b/vulkano/src/pipeline/graphics/vertex_input/mod.rs index e907e32d..7c1b1f44 100644 --- a/vulkano/src/pipeline/graphics/vertex_input/mod.rs +++ b/vulkano/src/pipeline/graphics/vertex_input/mod.rs @@ -87,7 +87,7 @@ //! different input rates, and it's also possible to have multiple bindings with the same input //! rate. //! -//! [`bind_vertex_buffers`]: crate::command_buffer::RecordingCommandBuffer::bind_vertex_buffers +//! [`bind_vertex_buffers`]: crate::command_buffer::AutoCommandBufferBuilder::bind_vertex_buffers #[allow(deprecated)] pub use self::{ diff --git a/vulkano/src/pipeline/layout.rs b/vulkano/src/pipeline/layout.rs index debf7d46..c0cc8200 100644 --- a/vulkano/src/pipeline/layout.rs +++ b/vulkano/src/pipeline/layout.rs @@ -45,7 +45,7 @@ //! compatible definitions, including the push constants, then descriptor sets above *N* remain //! valid. //! -//! [`RecordingCommandBuffer`] keeps track of this state and will automatically remove descriptor +//! [`AutoCommandBufferBuilder`] keeps track of this state and will automatically remove descriptor //! sets that have been invalidated by incompatible layouts in subsequent binding commands. //! //! # Creating pipeline layouts @@ -53,7 +53,7 @@ //! A pipeline layout is a Vulkan object type, represented in Vulkano with the `PipelineLayout` //! type. Each pipeline that you create holds a pipeline layout object. //! -//! [`RecordingCommandBuffer`]: crate::command_buffer::auto::RecordingCommandBuffer +//! [`AutoCommandBufferBuilder`]: crate::command_buffer::AutoCommandBufferBuilder use super::PipelineShaderStageCreateInfo; use crate::{ diff --git a/vulkano/src/pipeline/mod.rs b/vulkano/src/pipeline/mod.rs index 1a323c1b..d1186d1f 100644 --- a/vulkano/src/pipeline/mod.rs +++ b/vulkano/src/pipeline/mod.rs @@ -311,42 +311,42 @@ vulkan_enum! { /// [`ViewportState::viewports`](crate::pipeline::graphics::viewport::ViewportState::viewports). /// /// Set with - /// [`set_viewport`](crate::command_buffer::RecordingCommandBuffer::set_viewport). + /// [`set_viewport`](crate::command_buffer::AutoCommandBufferBuilder::set_viewport). Viewport = VIEWPORT, /// The elements, but not the count, of /// [`ViewportState::scissors`](crate::pipeline::graphics::viewport::ViewportState::scissors). /// /// Set with - /// [`set_scissor`](crate::command_buffer::RecordingCommandBuffer::set_scissor). + /// [`set_scissor`](crate::command_buffer::AutoCommandBufferBuilder::set_scissor). Scissor = SCISSOR, /// The value of /// [`RasterizationState::line_width`](crate::pipeline::graphics::rasterization::RasterizationState::line_width). /// /// Set with - /// [`set_line_width`](crate::command_buffer::RecordingCommandBuffer::set_line_width). + /// [`set_line_width`](crate::command_buffer::AutoCommandBufferBuilder::set_line_width). LineWidth = LINE_WIDTH, /// The value of /// [`RasterizationState::depth_bias`](crate::pipeline::graphics::rasterization::RasterizationState::depth_bias). /// /// Set with - /// [`set_depth_bias`](crate::command_buffer::RecordingCommandBuffer::set_depth_bias). + /// [`set_depth_bias`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_bias). DepthBias = DEPTH_BIAS, /// The value of /// [`ColorBlendState::blend_constants`](graphics::color_blend::ColorBlendState::blend_constants). /// /// Set with - /// [`set_blend_constants`](crate::command_buffer::RecordingCommandBuffer::set_blend_constants). + /// [`set_blend_constants`](crate::command_buffer::AutoCommandBufferBuilder::set_blend_constants). BlendConstants = BLEND_CONSTANTS, /// The value, but not the `Option` variant, of /// [`DepthStencilState::depth_bounds`](crate::pipeline::graphics::depth_stencil::DepthStencilState::depth_bounds). /// /// Set with - /// [`set_depth_bounds`](crate::command_buffer::RecordingCommandBuffer::set_depth_bounds). + /// [`set_depth_bounds`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_bounds). DepthBounds = DEPTH_BOUNDS, /// The value of @@ -354,7 +354,7 @@ vulkan_enum! { /// for both the front and back face. /// /// Set with - /// [`set_stencil_compare_mask`](crate::command_buffer::RecordingCommandBuffer::set_stencil_compare_mask). + /// [`set_stencil_compare_mask`](crate::command_buffer::AutoCommandBufferBuilder::set_stencil_compare_mask). StencilCompareMask = STENCIL_COMPARE_MASK, /// The value of @@ -362,7 +362,7 @@ vulkan_enum! { /// for both the front and back face. /// /// Set with - /// [`set_stencil_write_mask`](crate::command_buffer::RecordingCommandBuffer::set_stencil_write_mask). + /// [`set_stencil_write_mask`](crate::command_buffer::AutoCommandBufferBuilder::set_stencil_write_mask). StencilWriteMask = STENCIL_WRITE_MASK, /// The value of @@ -370,14 +370,14 @@ vulkan_enum! { /// for both the front and back face. /// /// Set with - /// [`set_stencil_reference`](crate::command_buffer::RecordingCommandBuffer::set_stencil_reference). + /// [`set_stencil_reference`](crate::command_buffer::AutoCommandBufferBuilder::set_stencil_reference). StencilReference = STENCIL_REFERENCE, /// The value of /// [`RasterizationState::cull_mode`](graphics::rasterization::RasterizationState::cull_mode). /// /// Set with - /// [`set_cull_mode`](crate::command_buffer::RecordingCommandBuffer::set_cull_mode). + /// [`set_cull_mode`](crate::command_buffer::AutoCommandBufferBuilder::set_cull_mode). CullMode = CULL_MODE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -388,7 +388,7 @@ vulkan_enum! { /// [`RasterizationState::front_face`](graphics::rasterization::RasterizationState::front_face). /// /// Set with - /// [`set_front_face`](crate::command_buffer::RecordingCommandBuffer::set_front_face). + /// [`set_front_face`](crate::command_buffer::AutoCommandBufferBuilder::set_front_face). FrontFace = FRONT_FACE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -399,7 +399,7 @@ vulkan_enum! { /// [`InputAssemblyState::topology`](graphics::input_assembly::InputAssemblyState::topology). /// /// Set with - /// [`set_primitive_topology`](crate::command_buffer::RecordingCommandBuffer::set_primitive_topology). + /// [`set_primitive_topology`](crate::command_buffer::AutoCommandBufferBuilder::set_primitive_topology). PrimitiveTopology = PRIMITIVE_TOPOLOGY RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -410,7 +410,7 @@ vulkan_enum! { /// [`ViewportState::viewports`](crate::pipeline::graphics::viewport::ViewportState::viewports). /// /// Set with - /// [`set_viewport_with_count`](crate::command_buffer::RecordingCommandBuffer::set_viewport_with_count). + /// [`set_viewport_with_count`](crate::command_buffer::AutoCommandBufferBuilder::set_viewport_with_count). ViewportWithCount = VIEWPORT_WITH_COUNT RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -421,7 +421,7 @@ vulkan_enum! { /// [`ViewportState::scissors`](crate::pipeline::graphics::viewport::ViewportState::scissors). /// /// Set with - /// [`set_scissor_with_count`](crate::command_buffer::RecordingCommandBuffer::set_scissor_with_count). + /// [`set_scissor_with_count`](crate::command_buffer::AutoCommandBufferBuilder::set_scissor_with_count). ScissorWithCount = SCISSOR_WITH_COUNT RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -440,7 +440,7 @@ vulkan_enum! { /// [`DepthStencilState::depth`](crate::pipeline::graphics::depth_stencil::DepthStencilState::depth). /// /// Set with - /// [`set_depth_test_enable`](crate::command_buffer::RecordingCommandBuffer::set_depth_test_enable). + /// [`set_depth_test_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_test_enable). DepthTestEnable = DEPTH_TEST_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -451,7 +451,7 @@ vulkan_enum! { /// [`DepthState::write_enable`](crate::pipeline::graphics::depth_stencil::DepthState::write_enable). /// /// Set with - /// [`set_depth_write_enable`](crate::command_buffer::RecordingCommandBuffer::set_depth_write_enable). + /// [`set_depth_write_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_write_enable). DepthWriteEnable = DEPTH_WRITE_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -462,7 +462,7 @@ vulkan_enum! { /// [`DepthState::compare_op`](crate::pipeline::graphics::depth_stencil::DepthState::compare_op). /// /// Set with - /// [`set_depth_compare_op`](crate::command_buffer::RecordingCommandBuffer::set_depth_compare_op). + /// [`set_depth_compare_op`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_compare_op). DepthCompareOp = DEPTH_COMPARE_OP RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -473,7 +473,7 @@ vulkan_enum! { /// [`DepthStencilState::depth_bounds`](crate::pipeline::graphics::depth_stencil::DepthStencilState::depth_bounds). /// /// Set with - /// [`set_depth_bounds_test_enable`](crate::command_buffer::RecordingCommandBuffer::set_depth_bounds_test_enable). + /// [`set_depth_bounds_test_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_bounds_test_enable). DepthBoundsTestEnable = DEPTH_BOUNDS_TEST_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -484,7 +484,7 @@ vulkan_enum! { /// [`DepthStencilState::stencil`](crate::pipeline::graphics::depth_stencil::DepthStencilState::stencil). /// /// Set with - /// [`set_stencil_test_enable`](crate::command_buffer::RecordingCommandBuffer::set_stencil_test_enable). + /// [`set_stencil_test_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_stencil_test_enable). StencilTestEnable = STENCIL_TEST_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -496,7 +496,7 @@ vulkan_enum! { /// for both the front and back face. /// /// Set with - /// [`set_stencil_op`](crate::command_buffer::RecordingCommandBuffer::set_stencil_op). + /// [`set_stencil_op`](crate::command_buffer::AutoCommandBufferBuilder::set_stencil_op). StencilOp = STENCIL_OP RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -507,7 +507,7 @@ vulkan_enum! { /// [`RasterizationState::rasterizer_discard_enable`](crate::pipeline::graphics::rasterization::RasterizationState::rasterizer_discard_enable). /// /// Set with - /// [`set_rasterizer_discard_enable`](crate::command_buffer::RecordingCommandBuffer::set_rasterizer_discard_enable). + /// [`set_rasterizer_discard_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_rasterizer_discard_enable). RasterizerDiscardEnable = RASTERIZER_DISCARD_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -518,7 +518,7 @@ vulkan_enum! { /// [`RasterizationState::depth_bias`](crate::pipeline::graphics::rasterization::RasterizationState::depth_bias). /// /// Set with - /// [`set_depth_bias_enable`](crate::command_buffer::RecordingCommandBuffer::set_depth_bias_enable). + /// [`set_depth_bias_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_depth_bias_enable). DepthBiasEnable = DEPTH_BIAS_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -529,7 +529,7 @@ vulkan_enum! { /// [`InputAssemblyState::primitive_restart_enable`](graphics::input_assembly::InputAssemblyState::primitive_restart_enable). /// /// Set with - /// [`set_primitive_restart_enable`](crate::command_buffer::RecordingCommandBuffer::set_primitive_restart_enable). + /// [`set_primitive_restart_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_primitive_restart_enable). PrimitiveRestartEnable = PRIMITIVE_RESTART_ENABLE RequiresOneOf([ RequiresAllOf([APIVersion(V1_3)]), @@ -547,7 +547,7 @@ vulkan_enum! { /// [`DiscardRectangleState::rectangles`](crate::pipeline::graphics::discard_rectangle::DiscardRectangleState::rectangles). /// /// Set with - /// [`set_discard_rectangle`](crate::command_buffer::RecordingCommandBuffer::set_discard_rectangle). + /// [`set_discard_rectangle`](crate::command_buffer::AutoCommandBufferBuilder::set_discard_rectangle). DiscardRectangle = DISCARD_RECTANGLE_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_discard_rectangles)]), @@ -602,7 +602,7 @@ vulkan_enum! { /// [`RasterizationState::line_stipple`](crate::pipeline::graphics::rasterization::RasterizationState::line_stipple). /// /// Set with - /// [`set_line_stipple`](crate::command_buffer::RecordingCommandBuffer::set_line_stipple). + /// [`set_line_stipple`](crate::command_buffer::AutoCommandBufferBuilder::set_line_stipple). LineStipple = LINE_STIPPLE_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_line_rasterization)]), @@ -612,7 +612,7 @@ vulkan_enum! { /// [`GraphicsPipelineCreateInfo::vertex_input_state`](crate::pipeline::graphics::GraphicsPipelineCreateInfo::vertex_input_state). /// /// Set with - /// [`set_vertex_input`](crate::command_buffer::RecordingCommandBuffer::set_vertex_input). + /// [`set_vertex_input`](crate::command_buffer::AutoCommandBufferBuilder::set_vertex_input). VertexInput = VERTEX_INPUT_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_vertex_input_dynamic_state)]), @@ -622,7 +622,7 @@ vulkan_enum! { /// [`TessellationState::patch_control_points`](graphics::tessellation::TessellationState::patch_control_points). /// /// Set with - /// [`set_patch_control_points`](crate::command_buffer::RecordingCommandBuffer::set_patch_control_points). + /// [`set_patch_control_points`](crate::command_buffer::AutoCommandBufferBuilder::set_patch_control_points). PatchControlPoints = PATCH_CONTROL_POINTS_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_extended_dynamic_state2)]), @@ -632,7 +632,7 @@ vulkan_enum! { /// [`ColorBlendState::logic_op`](graphics::color_blend::ColorBlendState::logic_op). /// /// Set with - /// [`set_logic_op`](crate::command_buffer::RecordingCommandBuffer::set_logic_op). + /// [`set_logic_op`](crate::command_buffer::AutoCommandBufferBuilder::set_logic_op). LogicOp = LOGIC_OP_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_extended_dynamic_state2)]), @@ -643,7 +643,7 @@ vulkan_enum! { /// for every attachment. /// /// Set with - /// [`set_color_write_enable`](crate::command_buffer::RecordingCommandBuffer::set_color_write_enable). + /// [`set_color_write_enable`](crate::command_buffer::AutoCommandBufferBuilder::set_color_write_enable). ColorWriteEnable = COLOR_WRITE_ENABLE_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_color_write_enable)]), @@ -737,7 +737,7 @@ vulkan_enum! { /// [`ConservativeRasterizationState::mode`](crate::pipeline::graphics::rasterization::RasterizationConservativeState::mode) /// /// Set with - /// [`set_conservative_rasterization_mode`](crate::command_buffer::RecordingCommandBuffer::set_conservative_rasterization_mode). + /// [`set_conservative_rasterization_mode`](crate::command_buffer::AutoCommandBufferBuilder::set_conservative_rasterization_mode). ConservativeRasterizationMode = CONSERVATIVE_RASTERIZATION_MODE_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_extended_dynamic_state3)]), @@ -747,7 +747,7 @@ vulkan_enum! { /// [`ConservativeRasterizationState::overestimation_size`](crate::pipeline::graphics::rasterization::RasterizationConservativeState::overestimation_size) /// /// Set with - /// [`set_extra_primitive_overestimation_size`](crate::command_buffer::RecordingCommandBuffer::set_extra_primitive_overestimation_size). + /// [`set_extra_primitive_overestimation_size`](crate::command_buffer::AutoCommandBufferBuilder::set_extra_primitive_overestimation_size). ExtraPrimitiveOverestimationSize = EXTRA_PRIMITIVE_OVERESTIMATION_SIZE_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_extended_dynamic_state3)]), diff --git a/vulkano/src/query.rs b/vulkano/src/query.rs index 804845d2..ac411976 100644 --- a/vulkano/src/query.rs +++ b/vulkano/src/query.rs @@ -156,7 +156,7 @@ impl QueryPool { /// /// [`self.ty().result_len()`]: QueryPool::result_len /// [`WITH_AVAILABILITY`]: QueryResultFlags::WITH_AVAILABILITY - /// [`copy_query_pool_results`]: crate::command_buffer::RecordingCommandBuffer::copy_query_pool_results + /// [`copy_query_pool_results`]: crate::command_buffer::AutoCommandBufferBuilder::copy_query_pool_results #[inline] pub fn get_results( &self, @@ -538,23 +538,23 @@ vulkan_enum! { /// /// Used with the [`begin_query`] and [`end_query`] commands. /// - /// [`begin_query`]: crate::command_buffer::RecordingCommandBuffer::begin_query - /// [`end_query`]: crate::command_buffer::RecordingCommandBuffer::end_query + /// [`begin_query`]: crate::command_buffer::AutoCommandBufferBuilder::begin_query + /// [`end_query`]: crate::command_buffer::AutoCommandBufferBuilder::end_query Occlusion = OCCLUSION, /// Tracks statistics on pipeline invocations and their input data. /// /// Used with the [`begin_query`] and [`end_query`] commands. /// - /// [`begin_query`]: crate::command_buffer::RecordingCommandBuffer::begin_query - /// [`end_query`]: crate::command_buffer::RecordingCommandBuffer::end_query + /// [`begin_query`]: crate::command_buffer::AutoCommandBufferBuilder::begin_query + /// [`end_query`]: crate::command_buffer::AutoCommandBufferBuilder::end_query PipelineStatistics = PIPELINE_STATISTICS, /// Writes timestamps at chosen points in a command buffer. /// /// Used with the [`write_timestamp`] command. /// - /// [`write_timestamp`]: crate::command_buffer::RecordingCommandBuffer::write_timestamp + /// [`write_timestamp`]: crate::command_buffer::AutoCommandBufferBuilder::write_timestamp Timestamp = TIMESTAMP, /// Queries the size of data resulting from a @@ -563,7 +563,7 @@ vulkan_enum! { /// Used with the [`write_acceleration_structures_properties`] command. /// /// [`CopyAccelerationStructureMode::Compact`]: crate::acceleration_structure::CopyAccelerationStructureMode::Compact - /// [`write_acceleration_structures_properties`]: crate::command_buffer::RecordingCommandBuffer::write_acceleration_structures_properties + /// [`write_acceleration_structures_properties`]: crate::command_buffer::AutoCommandBufferBuilder::write_acceleration_structures_properties AccelerationStructureCompactedSize = ACCELERATION_STRUCTURE_COMPACTED_SIZE_KHR RequiresOneOf([ RequiresAllOf([DeviceExtension(khr_acceleration_structure)]), @@ -575,7 +575,7 @@ vulkan_enum! { /// Used with the [`write_acceleration_structures_properties`] command. /// /// [`CopyAccelerationStructureMode::Serialize`]: crate::acceleration_structure::CopyAccelerationStructureMode::Serialize - /// [`write_acceleration_structures_properties`]: crate::command_buffer::RecordingCommandBuffer::write_acceleration_structures_properties + /// [`write_acceleration_structures_properties`]: crate::command_buffer::AutoCommandBufferBuilder::write_acceleration_structures_properties AccelerationStructureSerializationSize = ACCELERATION_STRUCTURE_SERIALIZATION_SIZE_KHR RequiresOneOf([ RequiresAllOf([DeviceExtension(khr_acceleration_structure)]), @@ -588,7 +588,7 @@ vulkan_enum! { /// Used with the [`write_acceleration_structures_properties`] command. /// /// [`CopyAccelerationStructureMode::Serialize`]: crate::acceleration_structure::CopyAccelerationStructureMode::Serialize - /// [`write_acceleration_structures_properties`]: crate::command_buffer::RecordingCommandBuffer::write_acceleration_structures_properties + /// [`write_acceleration_structures_properties`]: crate::command_buffer::AutoCommandBufferBuilder::write_acceleration_structures_properties AccelerationStructureSerializationBottomLevelPointers = ACCELERATION_STRUCTURE_SERIALIZATION_BOTTOM_LEVEL_POINTERS_KHR RequiresOneOf([ RequiresAllOf([DeviceExtension(khr_ray_tracing_maintenance1)]), @@ -598,7 +598,7 @@ vulkan_enum! { /// /// Used with the [`write_acceleration_structures_properties`] command. /// - /// [`write_acceleration_structures_properties`]: crate::command_buffer::RecordingCommandBuffer::write_acceleration_structures_properties + /// [`write_acceleration_structures_properties`]: crate::command_buffer::AutoCommandBufferBuilder::write_acceleration_structures_properties AccelerationStructureSize = ACCELERATION_STRUCTURE_SIZE_KHR RequiresOneOf([ RequiresAllOf([DeviceExtension(khr_ray_tracing_maintenance1)]), @@ -609,8 +609,8 @@ vulkan_enum! { /// Used with the [`begin_query`] and [`end_query`] commands. /// - /// [`begin_query`]: crate::command_buffer::RecordingCommandBuffer::begin_query - /// [`end_query`]: crate::command_buffer::RecordingCommandBuffer::end_query + /// [`begin_query`]: crate::command_buffer::AutoCommandBufferBuilder::begin_query + /// [`end_query`]: crate::command_buffer::AutoCommandBufferBuilder::end_query MeshPrimitivesGenerated = MESH_PRIMITIVES_GENERATED_EXT RequiresOneOf([ RequiresAllOf([DeviceExtension(ext_mesh_shader)]), diff --git a/vulkano/src/sync/event.rs b/vulkano/src/sync/event.rs index 413b320d..2423725a 100644 --- a/vulkano/src/sync/event.rs +++ b/vulkano/src/sync/event.rs @@ -10,9 +10,9 @@ //! An event can also be signaled from the host, by calling the [`set`] method directly on the //! [`Event`]. //! -//! [`set_event`]: crate::command_buffer::sys::RawRecordingCommandBuffer::set_event -//! [pipeline barrier]: crate::command_buffer::sys::RawRecordingCommandBuffer::pipeline_barrier -//! [`wait_events`]: crate::command_buffer::sys::RawRecordingCommandBuffer::wait_events +//! [`set_event`]: crate::command_buffer::sys::RecordingCommandBuffer::set_event +//! [pipeline barrier]: crate::command_buffer::sys::RecordingCommandBuffer::pipeline_barrier +//! [`wait_events`]: crate::command_buffer::sys::RecordingCommandBuffer::wait_events //! [`set`]: Event::set use crate::{ @@ -228,7 +228,7 @@ impl Event { /// - There must be an execution dependency between `reset` and the execution of any /// [`wait_events`] command that includes this event in its `events` parameter. /// - /// [`wait_events`]: crate::command_buffer::sys::RawRecordingCommandBuffer::wait_events + /// [`wait_events`]: crate::command_buffer::sys::RecordingCommandBuffer::wait_events #[inline] pub unsafe fn reset(&mut self) -> Result<(), Validated> { self.validate_reset()?;