From c9e00187dac57527135eda65a72f9f4ad2180a99 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Sat, 1 Mar 2025 14:10:24 +0100 Subject: [PATCH] Improve set prepared target interface --- vulkan-rs/src/render_target/mod.rs | 4 ++-- vulkan-rs/src/render_target/sub_pass.rs | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/vulkan-rs/src/render_target/mod.rs b/vulkan-rs/src/render_target/mod.rs index 5479232..af6d916 100644 --- a/vulkan-rs/src/render_target/mod.rs +++ b/vulkan-rs/src/render_target/mod.rs @@ -415,7 +415,7 @@ mod test { RenderTarget::builder() .add_sub_pass( SubPass::builder(target_images[0].width(), target_images[0].height()) - .set_prepared_targets(&target_images, 0, [0.0, 0.0, 0.0, 0.0], false) + .set_prepared_targets(&target_images, 0, None) .build(&device) .unwrap(), ) @@ -448,7 +448,7 @@ mod test { sub_pass_index: 1, input_indices: vec![1], }) - .set_prepared_targets(&target_images, 0, [0.0, 0.0, 0.0, 0.0], false) + .set_prepared_targets(&target_images, 0, None) .build(&device) .unwrap(), ) diff --git a/vulkan-rs/src/render_target/sub_pass.rs b/vulkan-rs/src/render_target/sub_pass.rs index 551b2fb..fa02d21 100644 --- a/vulkan-rs/src/render_target/sub_pass.rs +++ b/vulkan-rs/src/render_target/sub_pass.rs @@ -244,14 +244,15 @@ impl<'a> SubPassBuilder<'a> { mut self, prepared_targets: &'a [Arc], target_index: usize, - clear_color: impl Into<[f32; 4]>, - clear_on_load: bool, + clear_color: impl Into>, ) -> Self { + let clear_color = clear_color.into(); + self.prepared_targets = Some(( prepared_targets, target_index, - clear_color.into(), - clear_on_load, + clear_color.unwrap_or_default(), + clear_color.is_some(), )); self