refactor(vulkan): use array iterator + all for tex. fmt. support queries

Author: ErichDonGubler

wgpu-hal/src/vulkan/adapter.rs

@@ -2797,61 +2797,63 @@ impl crate::Adapter for super::Adapter {
 }
 
 fn is_format_16bit_norm_supported(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
-    let tiling = vk::ImageTiling::OPTIMAL;
-    let features = vk::FormatFeatureFlags::SAMPLED_IMAGE
-        | vk::FormatFeatureFlags::STORAGE_IMAGE
-        | vk::FormatFeatureFlags::TRANSFER_SRC
-        | vk::FormatFeatureFlags::TRANSFER_DST;
-    let r16unorm = supports_format(instance, phd, vk::Format::R16_UNORM, tiling, features);
-    let r16snorm = supports_format(instance, phd, vk::Format::R16_SNORM, tiling, features);
-    let rg16unorm = supports_format(instance, phd, vk::Format::R16G16_UNORM, tiling, features);
-    let rg16snorm = supports_format(instance, phd, vk::Format::R16G16_SNORM, tiling, features);
-    let rgba16unorm = supports_format(
-        instance,
-        phd,
+    [
+        vk::Format::R16_UNORM,
+        vk::Format::R16_SNORM,
+        vk::Format::R16G16_UNORM,
+        vk::Format::R16G16_SNORM,
         vk::Format::R16G16B16A16_UNORM,
-        tiling,
-        features,
-    );
-    let rgba16snorm = supports_format(
-        instance,
-        phd,
         vk::Format::R16G16B16A16_SNORM,
-        tiling,
-        features,
-    );
-
-    r16unorm && r16snorm && rg16unorm && rg16snorm && rgba16unorm && rgba16snorm
+    ]
+    .into_iter()
+    .all(|format| {
+        supports_format(
+            instance,
+            phd,
+            format,
+            vk::ImageTiling::OPTIMAL,
+            vk::FormatFeatureFlags::SAMPLED_IMAGE
+                | vk::FormatFeatureFlags::STORAGE_IMAGE
+                | vk::FormatFeatureFlags::TRANSFER_SRC
+                | vk::FormatFeatureFlags::TRANSFER_DST,
+        )
+    })
 }
 
 fn is_float32_filterable_supported(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
-    let tiling = vk::ImageTiling::OPTIMAL;
-    let features = vk::FormatFeatureFlags::SAMPLED_IMAGE_FILTER_LINEAR;
-    let r_float = supports_format(instance, phd, vk::Format::R32_SFLOAT, tiling, features);
-    let rg_float = supports_format(instance, phd, vk::Format::R32G32_SFLOAT, tiling, features);
-    let rgba_float = supports_format(
-        instance,
-        phd,
+    [
+        vk::Format::R32_SFLOAT,
+        vk::Format::R32G32_SFLOAT,
         vk::Format::R32G32B32A32_SFLOAT,
-        tiling,
-        features,
-    );
-    r_float && rg_float && rgba_float
+    ]
+    .into_iter()
+    .all(|format| {
+        supports_format(
+            instance,
+            phd,
+            format,
+            vk::ImageTiling::OPTIMAL,
+            vk::FormatFeatureFlags::SAMPLED_IMAGE_FILTER_LINEAR,
+        )
+    })
 }
 
 fn is_float32_blendable_supported(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
-    let tiling = vk::ImageTiling::OPTIMAL;
-    let features = vk::FormatFeatureFlags::COLOR_ATTACHMENT_BLEND;
-    let r_float = supports_format(instance, phd, vk::Format::R32_SFLOAT, tiling, features);
-    let rg_float = supports_format(instance, phd, vk::Format::R32G32_SFLOAT, tiling, features);
-    let rgba_float = supports_format(
-        instance,
-        phd,
+    [
+        vk::Format::R32_SFLOAT,
+        vk::Format::R32G32_SFLOAT,
         vk::Format::R32G32B32A32_SFLOAT,
-        tiling,
-        features,
-    );
-    r_float && rg_float && rgba_float
+    ]
+    .into_iter()
+    .all(|format| {
+        supports_format(
+            instance,
+            phd,
+            format,
+            vk::ImageTiling::OPTIMAL,
+            vk::FormatFeatureFlags::COLOR_ATTACHMENT_BLEND,
+        )
+    })
 }
 
 fn supports_format(
@@ -2870,9 +2872,7 @@ fn supports_format(
 }
 
 fn supports_astc_3d(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
-    let mut supports = true;
-
-    let astc_formats = [
+    [
         vk::Format::ASTC_4X4_UNORM_BLOCK,
         vk::Format::ASTC_4X4_SRGB_BLOCK,
         vk::Format::ASTC_5X4_UNORM_BLOCK,
@@ -2901,10 +2901,10 @@ fn supports_astc_3d(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
         vk::Format::ASTC_12X10_SRGB_BLOCK,
         vk::Format::ASTC_12X12_UNORM_BLOCK,
         vk::Format::ASTC_12X12_SRGB_BLOCK,
-    ];
-
-    for &format in &astc_formats {
-        let result = unsafe {
+    ]
+    .into_iter()
+    .all(|format| {
+        unsafe {
             instance.get_physical_device_image_format_properties(
                 phd,
                 format,
@@ -2913,14 +2913,9 @@ fn supports_astc_3d(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
                 vk::ImageUsageFlags::SAMPLED,
                 vk::ImageCreateFlags::empty(),
             )
-        };
-        if result.is_err() {
-            supports = false;
-            break;
         }
-    }
-
-    supports
+        .is_ok()
+    })
 }
 
 fn supports_bgra8unorm_storage(