Update to some demos/examples

aclysma · Apr 11, 2024 · 5640028 · 5640028
1 parent 295c336
commit 5640028
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/demo-web/src/lib.rs b/demo-web/src/lib.rs
@@ -92,12 +92,12 @@ pub fn update_loop(
  // the uniform instead of the vertex buffer. Buffers also need to be immutable while
  // processed, so we need one per swapchain image
  //
- let mut command_pools = Vec::with_capacity(swapchain_helper.image_count());
- let mut command_buffers = Vec::with_capacity(swapchain_helper.image_count());
- let mut vertex_buffers = Vec::with_capacity(swapchain_helper.image_count());
- let mut uniform_buffers = Vec::with_capacity(swapchain_helper.image_count());
+ let mut command_pools = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut command_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut vertex_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut uniform_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
 
- for _ in 0..swapchain_helper.image_count() {
+ for _ in 0..swapchain_helper.rotating_frame_count() {
  log::trace!("Creating command pool");
  let mut command_pool =
  graphics_queue.create_command_pool(&RafxCommandPoolDef { transient: true })?;
@@ -302,7 +302,7 @@ pub fn update_loop(
 
  // Initialize them all at once here.. this can be done per-frame as well.
  log::trace!("Set up descriptor sets");
- for i in 0..swapchain_helper.image_count() {
+ for i in 0..swapchain_helper.rotating_frame_count() {
  descriptor_set_array.update_descriptor_set(&[
  RafxDescriptorUpdate {
  array_index: i as u32,

diff --git a/rafx-api/src/extra/swapchain_helper.rs b/rafx-api/src/extra/swapchain_helper.rs
@@ -314,6 +314,10 @@ impl RafxSwapchainHelper {
  self.color_space
  }
 
+ pub fn rotating_frame_count(&self) -> usize {
+ crate::MAX_FRAMES_IN_FLIGHT + 1
+ }
+
  pub fn swapchain_def(&self) -> &RafxSwapchainDef {
  &self.swapchain_def
  }

diff --git a/rafx/examples/api_triangle/api_triangle.rs b/rafx/examples/api_triangle/api_triangle.rs
@@ -96,12 +96,12 @@ fn run() -> RafxResult<()> {
  // the uniform instead of the vertex buffer. Buffers also need to be immutable while
  // processed, so we need one per swapchain image
  //
- let mut command_pools = Vec::with_capacity(swapchain_helper.image_count());
- let mut command_buffers = Vec::with_capacity(swapchain_helper.image_count());
- let mut vertex_buffers = Vec::with_capacity(swapchain_helper.image_count());
- let mut uniform_buffers = Vec::with_capacity(swapchain_helper.image_count());
+ let mut command_pools = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut command_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut vertex_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
+ let mut uniform_buffers = Vec::with_capacity(swapchain_helper.rotating_frame_count());
 
- for _ in 0..swapchain_helper.image_count() {
+ for _ in 0..swapchain_helper.rotating_frame_count() {
  let mut command_pool =
  graphics_queue.create_command_pool(&RafxCommandPoolDef { transient: true })?;
 
@@ -238,7 +238,7 @@ fn run() -> RafxResult<()> {
  })?;
 
  // Initialize them all at once here.. this can be done per-frame as well.
- for i in 0..swapchain_helper.image_count() {
+ for i in 0..swapchain_helper.rotating_frame_count() {
  descriptor_set_array.update_descriptor_set(&[RafxDescriptorUpdate {
  array_index: i as u32,
  descriptor_key: RafxDescriptorKey::Name("color"),