aboutsummaryrefslogtreecommitdiff
path: root/adapters/fparkan-render-vulkan/src
diff options
context:
space:
mode:
Diffstat (limited to 'adapters/fparkan-render-vulkan/src')
-rw-r--r--adapters/fparkan-render-vulkan/src/ffi/smoke.rs10
-rw-r--r--adapters/fparkan-render-vulkan/src/planning_backend.rs9
2 files changed, 7 insertions, 12 deletions
diff --git a/adapters/fparkan-render-vulkan/src/ffi/smoke.rs b/adapters/fparkan-render-vulkan/src/ffi/smoke.rs
index 228e763..afb5b2a 100644
--- a/adapters/fparkan-render-vulkan/src/ffi/smoke.rs
+++ b/adapters/fparkan-render-vulkan/src/ffi/smoke.rs
@@ -43,7 +43,7 @@ fn take_runtime_children_with_validation_snapshot<
surface: &mut Option<Surface>,
device: &mut Option<Device>,
swapchain: &mut Option<Swapchain>,
- validation: &Option<Validation>,
+ validation: Option<&Validation>,
capture: Capture,
) -> Option<Snapshot>
where
@@ -52,7 +52,7 @@ where
swapchain.take();
device.take();
surface.take();
- validation.as_ref().map(capture)
+ validation.map(capture)
}
struct RollbackOnDrop<T, F>
@@ -672,7 +672,7 @@ impl VulkanSmokeRenderer {
&mut self.surface,
&mut self.device,
&mut self.swapchain,
- &self.validation,
+ self.validation.as_ref(),
VulkanValidationMessenger::report,
)
.unwrap_or_default();
@@ -695,7 +695,7 @@ impl VulkanSmokeRenderer {
&mut self.surface,
&mut self.device,
&mut self.swapchain,
- &self.validation,
+ self.validation.as_ref(),
VulkanValidationMessenger::report,
);
self.validation.take();
@@ -864,7 +864,7 @@ mod tests {
&mut surface,
&mut device,
&mut swapchain,
- &validation,
+ validation.as_ref(),
|_| {
log.borrow_mut().push(TeardownStep::Snapshot);
TeardownStep::Validation
diff --git a/adapters/fparkan-render-vulkan/src/planning_backend.rs b/adapters/fparkan-render-vulkan/src/planning_backend.rs
index 4936007..b68b054 100644
--- a/adapters/fparkan-render-vulkan/src/planning_backend.rs
+++ b/adapters/fparkan-render-vulkan/src/planning_backend.rs
@@ -10,9 +10,10 @@ use crate::{
};
/// Vulkan backend migration readiness.
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
pub enum VulkanPlanningBackendState {
/// Planning facade is configured and able to accept command lists.
+ #[default]
Configured,
/// Adapter is tracking a recoverable runtime surface/depth pipeline fault.
Degraded,
@@ -20,12 +21,6 @@ pub enum VulkanPlanningBackendState {
Error,
}
-impl Default for VulkanPlanningBackendState {
- fn default() -> Self {
- Self::Configured
- }
-}
-
/// Diagnostics for planning-facade request tracking.
#[derive(Clone, Debug, PartialEq)]
pub struct VulkanPlanningRequestReport {