Skip to content

Commit

Permalink
Update Vulkano
Browse files Browse the repository at this point in the history 
rename RecordingCommandBuffers and CommandBuffers back to AutoCommandBufferBuilder and their previous names
  • Loading branch information
@Letronix624
Letronix624 committed Oct 20, 2024
1 parent ddce81d commit 00ebd45
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 140 deletions.
78 changes: 36 additions & 42 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 10 additions & 18 deletions examples/multisample.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ use vulkano::{
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::{StandardCommandBufferAllocator, StandardCommandBufferAllocatorCreateInfo},
CommandBufferBeginInfo, CommandBufferInheritanceInfo, CommandBufferLevel,
CommandBufferUsage, RecordingCommandBuffer, RenderPassBeginInfo, SubpassBeginInfo,
SubpassContents,
AutoCommandBufferBuilder, CommandBufferInheritanceInfo, CommandBufferUsage,
RenderPassBeginInfo, SubpassBeginInfo, SubpassContents,
},
device::{Device, Queue},
format::Format,
Expand Down Expand Up @@ -355,14 +354,10 @@ impl MSAAPipeline {
image: Arc<ImageView>,
gui: &mut Gui,
) -> Box<dyn GpuFuture> {
let mut builder = RecordingCommandBuffer::new(
let mut builder = AutoCommandBufferBuilder::primary(
self.command_buffer_allocator.clone(),
self.queue.queue_family_index(),
CommandBufferLevel::Primary,
CommandBufferBeginInfo {
usage: CommandBufferUsage::OneTimeSubmit,
..Default::default()
},
CommandBufferUsage::OneTimeSubmit,
)
.unwrap();

Expand Down Expand Up @@ -409,15 +404,12 @@ impl MSAAPipeline {
.unwrap();

// Render first draw pass
let mut secondary_builder = RecordingCommandBuffer::new(
let mut secondary_builder = AutoCommandBufferBuilder::secondary(
self.command_buffer_allocator.clone(),
self.queue.queue_family_index(),
CommandBufferLevel::Secondary,
CommandBufferBeginInfo {
inheritance_info: Some(CommandBufferInheritanceInfo {
render_pass: Some(self.subpass.clone().into()),
..Default::default()
}),
CommandBufferUsage::MultipleSubmit,
CommandBufferInheritanceInfo {
render_pass: Some(self.subpass.clone().into()),
..Default::default()
},
)
Expand All @@ -441,7 +433,7 @@ impl MSAAPipeline {
unsafe {
secondary_builder.draw(self.vertex_buffer.len() as u32, 1, 0, 0).unwrap();
}
let cb = secondary_builder.end().unwrap();
let cb = secondary_builder.build().unwrap();
builder.execute_commands(cb).unwrap();

// Draw gui on subpass
Expand All @@ -450,7 +442,7 @@ impl MSAAPipeline {

// Last end render pass
builder.end_render_pass(Default::default()).unwrap();
let command_buffer = builder.end().unwrap();
let command_buffer = builder.build().unwrap();
let after_future = before_future.then_execute(self.queue.clone(), command_buffer).unwrap();

after_future.boxed()
Expand Down
28 changes: 10 additions & 18 deletions examples/subpass.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ use vulkano::{
buffer::{Buffer, BufferContents, BufferCreateInfo, BufferUsage, Subbuffer},
command_buffer::{
allocator::{StandardCommandBufferAllocator, StandardCommandBufferAllocatorCreateInfo},
CommandBufferBeginInfo, CommandBufferInheritanceInfo, CommandBufferLevel,
CommandBufferUsage, RecordingCommandBuffer, RenderPassBeginInfo, SubpassBeginInfo,
SubpassContents,
AutoCommandBufferBuilder, CommandBufferInheritanceInfo, CommandBufferUsage,
RenderPassBeginInfo, SubpassBeginInfo, SubpassContents,
},
device::{Device, Queue},
format::Format,
Expand Down Expand Up @@ -311,14 +310,10 @@ impl SimpleGuiPipeline {
image: Arc<ImageView>,
gui: &mut Gui,
) -> Box<dyn GpuFuture> {
let mut builder = RecordingCommandBuffer::new(
let mut builder = AutoCommandBufferBuilder::primary(
self.command_buffer_allocator.clone(),
self.queue.queue_family_index(),
CommandBufferLevel::Primary,
CommandBufferBeginInfo {
usage: CommandBufferUsage::OneTimeSubmit,
..Default::default()
},
CommandBufferUsage::OneTimeSubmit,
)
.unwrap();

Expand All @@ -344,15 +339,12 @@ impl SimpleGuiPipeline {
.unwrap();

// Render first draw pass
let mut secondary_builder = RecordingCommandBuffer::new(
let mut secondary_builder = AutoCommandBufferBuilder::secondary(
self.command_buffer_allocator.clone(),
self.queue.queue_family_index(),
CommandBufferLevel::Secondary,
CommandBufferBeginInfo {
inheritance_info: Some(CommandBufferInheritanceInfo {
render_pass: Some(self.subpass.clone().into()),
..Default::default()
}),
CommandBufferUsage::MultipleSubmit,
CommandBufferInheritanceInfo {
render_pass: Some(self.subpass.clone().into()),
..Default::default()
},
)
Expand All @@ -376,7 +368,7 @@ impl SimpleGuiPipeline {
unsafe {
secondary_builder.draw(self.vertex_buffer.len() as u32, 1, 0, 0).unwrap();
}
let cb = secondary_builder.end().unwrap();
let cb = secondary_builder.build().unwrap();
builder.execute_commands(cb).unwrap();

// Move on to next subpass for gui
Expand All @@ -392,7 +384,7 @@ impl SimpleGuiPipeline {

// Last end render pass
builder.end_render_pass(Default::default()).unwrap();
let command_buffer = builder.end().unwrap();
let command_buffer = builder.build().unwrap();
let after_future = before_future.then_execute(self.queue.clone(), command_buffer).unwrap();

after_future.boxed()
Expand Down
Loading

0 comments on commit 00ebd45

Please sign in to comment.