From 4167f222695bbf2873cd0d6d7d89e9de46741be2 Mon Sep 17 00:00:00 2001
From: Erich Gubler <erichdongubler@gmail.com>
Date: Fri, 9 Feb 2024 12:12:38 -0500
Subject: [PATCH] refactor(vulkan): extract
 `enumerate_instance_extension_properties` helper

This will be used shortly for checking if we should proceed with
enabling GPU-based validation.
---
 wgpu-hal/src/vulkan/instance.rs | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/wgpu-hal/src/vulkan/instance.rs b/wgpu-hal/src/vulkan/instance.rs
index 3d4cc84b116..199ce511883 100644
--- a/wgpu-hal/src/vulkan/instance.rs
+++ b/wgpu-hal/src/vulkan/instance.rs
@@ -211,6 +211,22 @@ impl super::Instance {
         &self.shared
     }
 
+    fn enumerate_instance_extension_properties(
+        entry: &ash::Entry,
+        layer_name: Option<&CStr>,
+    ) -> Result<Vec<vk::ExtensionProperties>, crate::InstanceError> {
+        let instance_extensions = {
+            profiling::scope!("vkEnumerateInstanceExtensionProperties");
+            entry.enumerate_instance_extension_properties(layer_name)
+        };
+        instance_extensions.map_err(|e| {
+            crate::InstanceError::with_source(
+                String::from("enumerate_instance_extension_properties() failed"),
+                e,
+            )
+        })
+    }
+
     /// Return the instance extension names wgpu would like to enable.
     ///
     /// Return a vector of the names of instance extensions actually available
@@ -229,16 +245,7 @@ impl super::Instance {
         _instance_api_version: u32,
         flags: wgt::InstanceFlags,
     ) -> Result<Vec<&'static CStr>, crate::InstanceError> {
-        let instance_extensions = {
-            profiling::scope!("vkEnumerateInstanceExtensionProperties");
-            entry.enumerate_instance_extension_properties(None)
-        };
-        let instance_extensions = instance_extensions.map_err(|e| {
-            crate::InstanceError::with_source(
-                String::from("enumerate_instance_extension_properties() failed"),
-                e,
-            )
-        })?;
+        let instance_extensions = Self::enumerate_instance_extension_properties(entry, None)?;
 
         // Check our extensions against the available extensions
         let mut extensions: Vec<&'static CStr> = Vec::new();