Fix physical device surface querying regression #2026 by removing surface caching (#2027)

* removed cache check for PhysicalDevice::surface_capabilities_unchecked, fixing window resize bug

* Fixed bug where new caching functionality caused surface queries to be
out of date. surface_capabilities, surface_formats,
surface_present_modes and surface_support are no longer cached as it is
proven that surface properties can change at runtime for a given
surface/physical device.

* Re-added caching for VK_KHR_surface structs surface_formats, surface_present_modes and surface_support, because unlike surface_capabilities, it is almost certain they won't change at runtime.

* remove surface_capabilities cache from macos/ios to fix builds

vulkano/src/device/physical.rs

@@ -1548,12 +1548,9 @@ impl PhysicalDevice {
         surface: &Surface<W>,
         surface_info: SurfaceInfo,
     ) -> Result<SurfaceCapabilities, VulkanError> {
-        surface.surface_capabilities.get_or_try_insert(
-            (self.handle, surface_info),
-            |(_, surface_info)| {
         /* Input */
 
-                let &SurfaceInfo {
+        let SurfaceInfo {
             full_screen_exclusive,
             win32_monitor,
             _ne: _,
@@ -1567,12 +1564,11 @@ impl PhysicalDevice {
         let mut full_screen_exclusive_win32_info = None;
 
         if self.supported_extensions().ext_full_screen_exclusive {
-                    let next = full_screen_exclusive_info.insert(
-                        ash::vk::SurfaceFullScreenExclusiveInfoEXT {
+            let next =
+                full_screen_exclusive_info.insert(ash::vk::SurfaceFullScreenExclusiveInfoEXT {
                     full_screen_exclusive: full_screen_exclusive.into(),
                     ..Default::default()
-                        },
-                    );
+                });
 
             next.p_next = info2.p_next as *mut _;
             info2.p_next = next as *const _ as *const _;
@@ -1609,8 +1605,8 @@ impl PhysicalDevice {
             .enabled_extensions()
             .khr_surface_protected_capabilities
         {
-                    let next = protected_capabilities
-                        .insert(ash::vk::SurfaceProtectedCapabilitiesKHR::default());
+            let next =
+                protected_capabilities.insert(ash::vk::SurfaceProtectedCapabilitiesKHR::default());
 
             next.p_next = info2.p_next as *mut _;
             info2.p_next = next as *const _ as *const _;
@@ -1648,8 +1644,7 @@ impl PhysicalDevice {
             } else {
                 Some(capabilities2.surface_capabilities.max_image_count)
             },
-                    current_extent: if capabilities2.surface_capabilities.current_extent.width
-                        == 0xffffffff
+            current_extent: if capabilities2.surface_capabilities.current_extent.width == 0xffffffff
                 && capabilities2.surface_capabilities.current_extent.height == 0xffffffff
             {
                 None
@@ -1667,9 +1662,7 @@ impl PhysicalDevice {
                 capabilities2.surface_capabilities.max_image_extent.width,
                 capabilities2.surface_capabilities.max_image_extent.height,
             ],
-                    max_image_array_layers: capabilities2
-                        .surface_capabilities
-                        .max_image_array_layers,
+            max_image_array_layers: capabilities2.surface_capabilities.max_image_array_layers,
             supported_transforms: capabilities2
                 .surface_capabilities
                 .supported_transforms
@@ -1686,21 +1679,17 @@ impl PhysicalDevice {
                 .supported_composite_alpha
                 .into(),
             supported_usage_flags: {
-                        let usage = ImageUsage::from(
-                            capabilities2.surface_capabilities.supported_usage_flags,
-                        );
+                let usage =
+                    ImageUsage::from(capabilities2.surface_capabilities.supported_usage_flags);
                 debug_assert!(usage.color_attachment); // specs say that this must be true
                 usage
             },
 
-                    supports_protected: protected_capabilities
-                        .map_or(false, |c| c.supports_protected != 0),
+            supports_protected: protected_capabilities.map_or(false, |c| c.supports_protected != 0),
 
             full_screen_exclusive_supported: capabilities_full_screen_exclusive
                 .map_or(false, |c| c.full_screen_exclusive_supported != 0),
         })
-            },
-        )
     }
 
     /// Returns the combinations of format and color space that are supported by the physical device

vulkano/src/swapchain/surface.rs

@@ -50,8 +50,6 @@ pub struct Surface<W> {
     // Data queried by the user at runtime, cached for faster lookups.
     // This is stored here rather than on `PhysicalDevice` to ensure that it's freed when the
     // `Surface` is destroyed.
-    pub(crate) surface_capabilities:
-        OnceCache<(ash::vk::PhysicalDevice, SurfaceInfo), SurfaceCapabilities>,
     pub(crate) surface_formats:
         OnceCache<(ash::vk::PhysicalDevice, SurfaceInfo), Vec<(Format, ColorSpace)>>,
     pub(crate) surface_present_modes: OnceCache<ash::vk::PhysicalDevice, Vec<PresentMode>>,
@@ -83,7 +81,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -148,7 +145,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -246,7 +242,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -326,7 +321,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -414,7 +408,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -499,7 +492,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -584,7 +576,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -670,7 +661,6 @@ impl<W> Surface<W> {
             has_swapchain: AtomicBool::new(false),
             metal_layer,
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -757,7 +747,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -834,7 +823,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -924,7 +912,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -1004,7 +991,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -1096,7 +1082,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -1186,7 +1171,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -1276,7 +1260,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),
@@ -1366,7 +1349,6 @@ impl<W> Surface<W> {
             #[cfg(target_os = "ios")]
             metal_layer: IOSMetalLayer::new(std::ptr::null_mut(), std::ptr::null_mut()),
 
-            surface_capabilities: OnceCache::new(),
             surface_formats: OnceCache::new(),
             surface_present_modes: OnceCache::new(),
             surface_support: OnceCache::new(),