Update winit and crossbeam versions (#1177)

CHANGELOG_VULKANO.md

@@ -1,5 +1,6 @@
-# Unreleased
+# Unreleased (breaking)
 
+- Update to winit 0.19
 - Add support for `#include "..."` and `#include <...>` directives within source
   files.
 - Add a `union` method for the extensions types.

examples/Cargo.toml

@@ -12,7 +12,7 @@ vulkano = { path = "../vulkano" }
 vulkano-shaders = { path = "../vulkano-shaders" }
 # The Vulkan library doesn't provide any functionality to create and handle windows, as
 # this would be out of scope. In order to open a window, we are going to use the `winit` crate.
-winit = "0.18"
+winit = "0.19"
 # The `vulkano_win` crate is the link between `vulkano` and `winit`. Vulkano doesn't know about winit,
 # and winit doesn't know about vulkano, so import a crate that will provide a link between the two.
 vulkano-win = { path = "../vulkano-win" }

vulkano-win/Cargo.toml

@@ -12,7 +12,7 @@ keywords = ["vulkan", "bindings", "graphics", "gpu", "rendering"]
 categories = ["rendering::graphics-api"]
 
 [dependencies]
-winit = "0.18"
+winit = "0.19"
 vulkano = { version = "0.11.0", path = "../vulkano" }
 
 [target.'cfg(target_os = "macos")'.dependencies]

vulkano/Cargo.toml

@@ -13,7 +13,7 @@ readme = "../README.md"
 build = "build.rs"
 
 [dependencies]
-crossbeam = "0.6"
+crossbeam = "0.7"
 fnv = "1.0.6"
 shared_library = "0.1.7"
 smallvec = "0.6.0"

vulkano/src/command_buffer/pool/standard.rs

@@ -7,7 +7,7 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-use crossbeam::queue::MsQueue;
+use crossbeam::queue::SegQueue;
 use fnv::FnvHashMap;
 use std::collections::hash_map::Entry;
 use std::marker::PhantomData;
@@ -59,9 +59,9 @@ struct StandardCommandPoolPerThread {
     // The Vulkan pool of this thread.
     pool: Mutex<UnsafeCommandPool>,
     // List of existing primary command buffers that are available for reuse.
-    available_primary_command_buffers: MsQueue<UnsafeCommandPoolAlloc>,
+    available_primary_command_buffers: SegQueue<UnsafeCommandPoolAlloc>,
     // List of existing secondary command buffers that are available for reuse.
-    available_secondary_command_buffers: MsQueue<UnsafeCommandPoolAlloc>,
+    available_secondary_command_buffers: SegQueue<UnsafeCommandPoolAlloc>,
 }
 
 impl StandardCommandPool {
@@ -105,8 +105,8 @@ unsafe impl CommandPool for Arc<StandardCommandPool> {
                     UnsafeCommandPool::new(self.device.clone(), self.queue_family(), false, true)?;
                 let pt = Arc::new(StandardCommandPoolPerThread {
                                       pool: Mutex::new(new_pool),
-                                      available_primary_command_buffers: MsQueue::new(),
-                                      available_secondary_command_buffers: MsQueue::new(),
+                                      available_primary_command_buffers: SegQueue::new(),
+                                      available_secondary_command_buffers: SegQueue::new(),
                                   });
 
                 entry.insert(Arc::downgrade(&pt));
@@ -126,7 +126,7 @@ unsafe impl CommandPool for Arc<StandardCommandPool> {
             };
 
             for _ in 0 .. count as usize {
-                if let Some(cmd) = existing.try_pop() {
+                if let Ok(cmd) = existing.pop() {
                     output.push(StandardCommandPoolBuilder {
                                     inner: StandardCommandPoolAlloc {
                                         cmd: ManuallyDrop::new(cmd),

vulkano/src/descriptor/descriptor_set/fixed_size_pool.rs

@@ -225,7 +225,7 @@ unsafe impl DescriptorPool for LocalPool {
             // Try to extract a descriptor from the current pool if any exist.
             // This is the most common case.
             if let Some(ref mut current_pool) = self.current_pool {
-                if let Some(already_existing_set) = current_pool.reserve.try_pop() {
+                if let Ok(already_existing_set) = current_pool.reserve.pop() {
                     return Ok(LocalPoolAlloc {
                                   actual_alloc: Some(already_existing_set),
                                   pool: current_pool.clone(),