Fix checks from vulkano-rs#2009 (vulkano-rs#2023)

marc0246 · Oct 6, 2022 · f99c679 · f99c679
1 parent 2992f0d
commit f99c679
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/vulkano/src/sync/future/fence_signal.rs b/vulkano/src/sync/future/fence_signal.rs
@@ -309,7 +309,9 @@ where
                                 true,
                             ) {
                                 Ok(_) => (),
-                                Err(AccessCheckError::Unknown) => return Err(AccessError::SwapchainImageNotAcquired.into()),
+                                Err(AccessCheckError::Unknown) => {
+                                    return Err(AccessError::SwapchainImageNotAcquired.into())
+                                }
                                 Err(AccessCheckError::Denied(e)) => return Err(e.into()),
                             }
                         }

diff --git a/vulkano/src/sync/future/join.rs b/vulkano/src/sync/future/join.rs
@@ -287,9 +287,7 @@ where
                 Err(AccessCheckError::Denied(e1))
             } // TODO: which one?
             (Ok(_), Err(AccessCheckError::Denied(_)))
-            | (Err(AccessCheckError::Denied(_)), Ok(_)) => {
-                panic!("Contradictory information between two futures")
-            }
+            | (Err(AccessCheckError::Denied(_)), Ok(_)) => Ok(()),
             (Ok(_), Ok(_)) => Ok(()), // TODO: Double Acquired?
         }
     }