Merge pull request #1 from freesig/nannou_patches

Nannou patches
freesig · Dec 27, 2018 · 987e015 · 987e015
2 parents 2947d5d + d57f7c6
commit 987e015
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/vulkano/Cargo.toml b/vulkano/Cargo.toml
@@ -13,7 +13,7 @@ readme = "../README.md"
 build = "build.rs"
 
 [dependencies]
-crossbeam = "0.5"
+crossbeam = "0.6"
 fnv = "1.0.6"
 shared_library = "0.1.7"
 smallvec = "0.6.0"

diff --git a/vulkano/src/sync/future/fence_signal.rs b/vulkano/src/sync/future/fence_signal.rs
@@ -164,6 +164,7 @@ impl<F> FenceSignalFuture<F>
 
  match *state {
  FenceSignalFutureState::Flushed(ref mut prev, ref fence) => {
+ /*
  match fence.wait(Some(Duration::from_secs(0))) {
  Ok(()) => unsafe {
  prev.signal_finished()
@@ -173,6 +174,21 @@ impl<F> FenceSignalFuture<F>
  return;
  },
  }
+ */
+ std::thread::sleep(Duration::from_millis(1));
+ match fence.ready() {
+ Ok(true) => unsafe {
+ prev.signal_finished()
+ },
+ Ok(false) => {
+ prev.cleanup_finished();
+ return;
+ },
+ Err(_) => {
+ prev.cleanup_finished();
+ return;
+ },
+ } 
  },
  FenceSignalFutureState::Pending(ref mut prev, _) => {
  prev.cleanup_finished();