Add PhysicalDevice::presentation_support (#2562)

Cargo.toml

@@ -71,6 +71,8 @@ syn = "2.0"
 thread_local = "1.1"
 vk-parse = "0.12"
 winit = { version = "0.29", default-features = false }
+x11-dl = "2.0"
+x11rb = "0.13"
 
 # Only used in examples
 glam = "0.25"

examples/async-update/Cargo.toml

@@ -14,7 +14,7 @@ doc = false
 [dependencies]
 glam = { workspace = true }
 rand = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 vulkano-taskgraph = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/async-update/main.rs

@@ -110,9 +110,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -127,7 +124,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -232,6 +229,9 @@ fn main() -> Result<(), impl Error> {
  let graphics_flight_id = resources.create_flight(MAX_FRAMES_IN_FLIGHT).unwrap();
  let transfer_flight_id = resources.create_flight(1).unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let swapchain_format = device
  .physical_device()
  .surface_formats(&surface, Default::default())

examples/basic-compute-shader/Cargo.toml

@@ -12,5 +12,5 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }

examples/buffer-allocator/Cargo.toml

@@ -12,6 +12,6 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/buffer-allocator/main.rs

@@ -62,9 +62,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -79,7 +76,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -114,6 +111,9 @@ fn main() -> Result<(), impl Error> {
 
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/clear-attachments/Cargo.toml

@@ -12,5 +12,5 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true }
+vulkano = { workspace = true, default-features = true }
 winit = { workspace = true, default-features = true }

examples/clear-attachments/main.rs

@@ -42,9 +42,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -59,7 +56,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -93,6 +90,9 @@ fn main() -> Result<(), impl Error> {
  .unwrap();
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/debug/Cargo.toml

@@ -12,4 +12,4 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true }
+vulkano = { workspace = true, default-features = true }

examples/deferred/Cargo.toml

@@ -13,6 +13,6 @@ doc = false
 
 [dependencies]
 glam = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/deferred/main.rs

@@ -65,9 +65,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -82,7 +79,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -116,6 +113,9 @@ fn main() -> Result<(), impl Error> {
  .unwrap();
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, mut images) = {
  let surface_capabilities = device
  .physical_device()

examples/dynamic-buffers/Cargo.toml

@@ -12,5 +12,5 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }

examples/dynamic-local-size/Cargo.toml

@@ -13,5 +13,5 @@ doc = false
 
 [dependencies]
 png = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }

examples/gl-interop/Cargo.toml

@@ -13,7 +13,7 @@ doc = false
 
 [dependencies]
 glium = "0.32.1"
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }
 # Glium has still not been updated to the latest winit version

examples/gl-interop/main.rs

@@ -531,9 +531,6 @@ mod linux {
  .unwrap()
  };
 
- let window = Arc::new(WindowBuilder::new().build(event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_external_semaphore: true,
  khr_external_semaphore_fd: true,
@@ -555,7 +552,7 @@ mod linux {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -597,6 +594,9 @@ mod linux {
 
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/image-self-copy-blit/Cargo.toml

@@ -13,6 +13,6 @@ doc = false
 
 [dependencies]
 png = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/image-self-copy-blit/main.rs

@@ -67,9 +67,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -84,7 +81,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -118,6 +115,9 @@ fn main() -> Result<(), impl Error> {
  .unwrap();
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/image/Cargo.toml

@@ -13,6 +13,6 @@ doc = false
 
 [dependencies]
 png = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/image/main.rs

@@ -65,9 +65,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -82,7 +79,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -116,6 +113,9 @@ fn main() -> Result<(), impl Error> {
  .unwrap();
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/immutable-sampler/Cargo.toml

@@ -13,6 +13,6 @@ doc = false
 
 [dependencies]
 png = { workspace = true }
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/immutable-sampler/main.rs

@@ -71,9 +71,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  ..DeviceExtensions::empty()
@@ -88,7 +85,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -122,6 +119,9 @@ fn main() -> Result<(), impl Error> {
  .unwrap();
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/indirect/Cargo.toml

@@ -12,6 +12,6 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }

examples/indirect/main.rs

@@ -78,9 +78,6 @@ fn main() -> Result<(), impl Error> {
  )
  .unwrap();
 
- let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
- let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
-
  let device_extensions = DeviceExtensions {
  khr_swapchain: true,
  khr_storage_buffer_storage_class: true,
@@ -96,7 +93,7 @@ fn main() -> Result<(), impl Error> {
  .enumerate()
  .position(|(i, q)| {
  q.queue_flags.intersects(QueueFlags::GRAPHICS)
- && p.surface_support(i as u32, &surface).unwrap_or(false)
+ && p.presentation_support(i as u32, &event_loop).unwrap()
  })
  .map(|i| (p, i as u32))
  })
@@ -131,6 +128,9 @@ fn main() -> Result<(), impl Error> {
 
  let queue = queues.next().unwrap();
 
+ let window = Arc::new(WindowBuilder::new().build(&event_loop).unwrap());
+ let surface = Surface::from_window(instance.clone(), window.clone()).unwrap();
+
  let (mut swapchain, images) = {
  let surface_capabilities = device
  .physical_device()

examples/instancing/Cargo.toml

@@ -12,6 +12,6 @@ bench = false
 doc = false
 
 [dependencies]
-vulkano = { workspace = true, features = ["macros"]  }
+vulkano = { workspace = true, default-features = true }
 vulkano-shaders = { workspace = true }
 winit = { workspace = true, default-features = true }