ValidationError-ify futures (#2271)

* ValidationError-ify sync primitives * Fix Windows error * Return timeouts as errors instead * Simplify a bit * ValidationError-ify futures * Update vulkano/src/sync/future/semaphore_signal.rs Co-authored-by: marc0246 <40955683+marc0246@users.noreply.github.com> * Update vulkano/src/swapchain/acquire_present.rs Co-authored-by: marc0246 <40955683+marc0246@users.noreply.github.com> * Update vulkano/src/sync/future/fence_signal.rs Co-authored-by: marc0246 <40955683+marc0246@users.noreply.github.com> --------- Co-authored-by: marc0246 <40955683+marc0246@users.noreply.github.com>
vulkano-rs · Aug 4, 2023 · b7c79ac · b7c79ac
1 parent 12dc95c
commit b7c79ac
Show file tree

Hide file tree

Showing 32 changed files with 390 additions and 592 deletions.
diff --git a/examples/src/bin/async-update.rs b/examples/src/bin/async-update.rs
@@ -85,11 +85,10 @@ use vulkano::{
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- VulkanLibrary,
+ sync::{self, GpuFuture},
+ Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
@@ -570,9 +569,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -666,11 +665,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/buffer-allocator.rs b/examples/src/bin/buffer-allocator.rs
@@ -44,11 +44,10 @@ use vulkano::{
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- VulkanLibrary,
+ sync::{self, GpuFuture},
+ Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -318,9 +317,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -409,11 +408,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(Box::new(future) as Box<_>);
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(Box::new(sync::now(device.clone())) as Box<_>);
  }

diff --git a/examples/src/bin/clear_attachments.rs b/examples/src/bin/clear_attachments.rs
@@ -21,11 +21,10 @@ use vulkano::{
  instance::{Instance, InstanceCreateFlags, InstanceCreateInfo},
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- VulkanLibrary,
+ sync::{self, GpuFuture},
+ Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -196,9 +195,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -276,11 +275,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/deferred/main.rs b/examples/src/bin/deferred/main.rs
@@ -41,11 +41,10 @@ use vulkano::{
  instance::{Instance, InstanceCreateFlags, InstanceCreateInfo},
  memory::allocator::StandardMemoryAllocator,
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- VulkanLibrary,
+ sync::{self, GpuFuture},
+ Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -222,9 +221,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -269,11 +268,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/gl-interop.rs b/examples/src/bin/gl-interop.rs
@@ -60,16 +60,18 @@ mod linux {
  PipelineShaderStageCreateInfo,
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
- swapchain::{AcquireError, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo},
+ swapchain::{
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
+ },
  sync::{
  now,
  semaphore::{
  ExternalSemaphoreHandleType, ExternalSemaphoreHandleTypes, Semaphore,
  SemaphoreCreateInfo,
  },
- FlushError, GpuFuture,
+ GpuFuture,
  },
- VulkanLibrary,
+ Validated, VulkanError, VulkanLibrary,
  };
  use winit::{
  event::{Event, WindowEvent},
@@ -349,15 +351,19 @@ mod linux {
  recreate_swapchain = false;
  }
 
- let (image_index, suboptimal, acquire_future) =
- match vulkano::swapchain::acquire_next_image(swapchain.clone(), None) {
- Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
- recreate_swapchain = true;
- return;
- }
- Err(e) => panic!("failed to acquire next image: {e}"),
- };
+ let (image_index, suboptimal, acquire_future) = match acquire_next_image(
+ swapchain.clone(),
+ None,
+ )
+ .map_err(Validated::unwrap)
+ {
+ Ok(r) => r,
+ Err(VulkanError::OutOfDate) => {
+ recreate_swapchain = true;
+ return;
+ }
+ Err(e) => panic!("failed to acquire next image: {e}"),
+ };
 
  if suboptimal {
  recreate_swapchain = true;
@@ -413,12 +419,12 @@ mod linux {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  future.wait(None).unwrap();
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(vulkano::sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/image-self-copy-blit/main.rs b/examples/src/bin/image-self-copy-blit/main.rs
@@ -46,11 +46,10 @@ use vulkano::{
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- DeviceSize, VulkanLibrary,
+ sync::{self, GpuFuture},
+ DeviceSize, Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -443,9 +442,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -504,11 +503,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/image/main.rs b/examples/src/bin/image/main.rs
@@ -45,11 +45,10 @@ use vulkano::{
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- DeviceSize, VulkanLibrary,
+ sync::{self, GpuFuture},
+ DeviceSize, Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -391,9 +390,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -452,11 +451,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/immutable-sampler/main.rs b/examples/src/bin/immutable-sampler/main.rs
@@ -54,11 +54,10 @@ use vulkano::{
  },
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- DeviceSize, VulkanLibrary,
+ sync::{self, GpuFuture},
+ DeviceSize, Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -412,9 +411,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -473,11 +472,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }

diff --git a/examples/src/bin/indirect.rs b/examples/src/bin/indirect.rs
@@ -61,11 +61,10 @@ use vulkano::{
  render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass},
  single_pass_renderpass,
  swapchain::{
- acquire_next_image, AcquireError, Surface, Swapchain, SwapchainCreateInfo,
- SwapchainPresentInfo,
+ acquire_next_image, Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo,
  },
- sync::{self, FlushError, GpuFuture},
- VulkanLibrary,
+ sync::{self, GpuFuture},
+ Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
  event::{Event, WindowEvent},
@@ -412,9 +411,9 @@ fn main() {
  }
 
  let (image_index, suboptimal, acquire_future) =
- match acquire_next_image(swapchain.clone(), None) {
+ match acquire_next_image(swapchain.clone(), None).map_err(Validated::unwrap) {
  Ok(r) => r,
- Err(AcquireError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  return;
  }
@@ -520,11 +519,11 @@ fn main() {
  )
  .then_signal_fence_and_flush();
 
- match future {
+ match future.map_err(Validated::unwrap) {
  Ok(future) => {
  previous_frame_end = Some(future.boxed());
  }
- Err(FlushError::OutOfDate) => {
+ Err(VulkanError::OutOfDate) => {
  recreate_swapchain = true;
  previous_frame_end = Some(sync::now(device.clone()).boxed());
  }