Merge branch 'master' into maybe-running-examples-in-ci

CHANGELOG.md

@@ -7,17 +7,27 @@
     Pull Request merge. 
 -->
 
+### Public dependency updates
+- [raw-window-handle](https://crates.io/raw-window-handle) 0.6
+- [winit](https://crates.io/crates/winit) 0.29
+
 ### Public dependency updates
 
 ### Breaking changes
 
+Changes to `Surface`:
+- `Surface::required_extensions` now returns a result.
+- `Surface::from_window[_ref]` now take `HasWindowHandle + HasDisplayHandle` as the window and return a new error type.
+
 ### Additions
 
 - Partially validated versions of `submit` and `present` commands (called via `QueueGuard`).
 - Support for the `khr_timeline_semaphore` extension.
 
 ### Bugs fixed
 
+- Incorrect assert condition in `PipelineLayout::is_compatible_with`.
+
 # Version 0.34.1 (2023-10-29)
 
 ### Bugs fixed

Cargo.toml

@@ -1,10 +1,11 @@
 [workspace]
 members = [
+    "examples/*",
     "vulkano",
     "vulkano-macros",
     "vulkano-shaders",
     "vulkano-util",
-    "vulkano-win",
+    # "vulkano-win",
 ]
 resolver = "2"
 
@@ -44,13 +45,19 @@ parking_lot = "0.12"
 proc-macro2 = "1.0"
 proc-macro-crate = "1.2"
 quote = "1.0"
-raw-window-handle = "0.5"
+raw-window-handle = "0.6"
 regex = "1.8"
 serde = "1.0"
 serde_json = "1.0"
 shaderc = "0.8"
 smallvec = "1.8"
-syn = "1.0"
+syn = "2.0"
 thread_local = "1.1"
 vk-parse = "0.12"
-winit = "0.28"
+winit = "0.29"
+
+# Only used in examples
+cgmath = "0.18"
+png = "0.17"
+rand = "0.8"
+ron = "0.8"

examples/async-update/main.rs

@@ -39,6 +39,7 @@
 use cgmath::{Matrix4, Rad};
 use rand::Rng;
 use std::{
+    error::Error,
     hint,
     sync::{
         atomic::{AtomicBool, AtomicU64, Ordering},
@@ -91,18 +92,19 @@ use vulkano::{
     Validated, VulkanError, VulkanLibrary,
 };
 use winit::{
-    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
+    event::{ElementState, Event, KeyEvent, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
+    keyboard::{Key, NamedKey},
     window::WindowBuilder,
 };
 
 const TRANSFER_GRANULARITY: u32 = 4096;
 
-fn main() {
-    let event_loop = EventLoop::new();
+fn main() -> Result<(), impl Error> {
+    let event_loop = EventLoop::new().unwrap();
 
     let library = VulkanLibrary::new().unwrap();
-    let required_extensions = Surface::required_extensions(&event_loop);
+    let required_extensions = Surface::required_extensions(&event_loop).unwrap();
     let instance = Instance::new(
         library,
         InstanceCreateInfo {
@@ -521,13 +523,15 @@ fn main() {
 
     println!("\nPress space to update part of the texture");
 
-    event_loop.run(move |event, _, control_flow| {
+    event_loop.run(move |event, elwt| {
+        elwt.set_control_flow(ControlFlow::Poll);
+
         match event {
             Event::WindowEvent {
                 event: WindowEvent::CloseRequested,
                 ..
             } => {
-                *control_flow = ControlFlow::Exit;
+                elwt.exit();
             }
             Event::WindowEvent {
                 event: WindowEvent::Resized(_),
@@ -538,10 +542,10 @@ fn main() {
             Event::WindowEvent {
                 event:
                     WindowEvent::KeyboardInput {
-                        input:
-                            KeyboardInput {
+                        event:
+                            KeyEvent {
+                                logical_key: Key::Named(NamedKey::Space),
                                 state: ElementState::Released,
-                                virtual_keycode: Some(VirtualKeyCode::Space),
                                 ..
                             },
                         ..
@@ -550,7 +554,10 @@ fn main() {
             } => {
                 channel.send(()).unwrap();
             }
-            Event::RedrawEventsCleared => {
+            Event::WindowEvent {
+                event: WindowEvent::RedrawRequested,
+                ..
+            } => {
                 let image_extent: [u32; 2] = window.inner_size().into();
 
                 if image_extent.contains(&0) {
@@ -685,9 +692,10 @@ fn main() {
                     }
                 }
             }
+            Event::AboutToWait => window.request_redraw(),
             _ => (),
         }
-    });
+    })
 }
 
 #[allow(clippy::too_many_arguments)]

examples/buffer-allocator/main.rs

@@ -10,6 +10,7 @@
 // Modified triangle example to show `SubbufferAllocator`.
 
 use std::{
+    error::Error,
     sync::Arc,
     time::{SystemTime, UNIX_EPOCH},
 };
@@ -55,11 +56,11 @@ use winit::{
     window::WindowBuilder,
 };
 
-fn main() {
-    let event_loop = EventLoop::new();
+fn main() -> Result<(), impl Error> {
+    let event_loop = EventLoop::new().unwrap();
 
     let library = VulkanLibrary::new().unwrap();
-    let required_extensions = Surface::required_extensions(&event_loop);
+    let required_extensions = Surface::required_extensions(&event_loop).unwrap();
     let instance = Instance::new(
         library,
         InstanceCreateInfo {
@@ -280,21 +281,26 @@ fn main() {
     let command_buffer_allocator =
         StandardCommandBufferAllocator::new(device.clone(), Default::default());
 
-    event_loop.run(move |event, _, control_flow| {
+    event_loop.run(move |event, elwt| {
+        elwt.set_control_flow(ControlFlow::Poll);
+
         match event {
             Event::WindowEvent {
                 event: WindowEvent::CloseRequested,
                 ..
             } => {
-                *control_flow = ControlFlow::Exit;
+                elwt.exit();
             }
             Event::WindowEvent {
                 event: WindowEvent::Resized(_),
                 ..
             } => {
                 recreate_swapchain = true;
             }
-            Event::RedrawEventsCleared => {
+            Event::WindowEvent {
+                event: WindowEvent::RedrawRequested,
+                ..
+            } => {
                 let image_extent: [u32; 2] = window.inner_size().into();
 
                 if image_extent.contains(&0) {
@@ -426,9 +432,10 @@ fn main() {
                     }
                 }
             }
+            Event::AboutToWait => window.request_redraw(),
             _ => (),
         }
-    });
+    })
 }
 
 /// This function is called once during initialization, then again whenever the window is resized.