From: Chad Versace <chad.versace@intel.com>
Date: Thu, 9 Jul 2015 23:22:18 +0000 (-0700)
Subject: vk/device: Add func anv_physical_device_finish()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4422bd4cf61c4f05f853dc790c03ab04c138d7b0;p=mesa.git

vk/device: Add func anv_physical_device_finish()

Because in a follow-up patch I need to do some non-trival teardown on
anv_physical_device. Currently, however, anv_physical_device_finish() is
currently a no-op that's just called in the right place.

Also, rename function fill_physical_device -> anv_physical_device_init
for symmetry.
---

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 25df95853ad..0856bcec400 100644
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -41,10 +41,16 @@ anv_env_get_int(const char *name)
    return strtol(val, NULL, 0);
 }
 
+static void
+anv_physical_device_finish(struct anv_physical_device *device)
+{
+   /* Nothing to do */
+}
+
 static VkResult
-fill_physical_device(struct anv_physical_device *device,
-                     struct anv_instance *instance,
-                     const char *path)
+anv_physical_device_init(struct anv_physical_device *device,
+                         struct anv_instance *instance,
+                         const char *path)
 {
    int fd;
    
@@ -150,6 +156,10 @@ VkResult anv_DestroyInstance(
 {
    ANV_FROM_HANDLE(anv_instance, instance, _instance);
 
+   if (instance->physicalDeviceCount > 0) {
+      anv_physical_device_finish(&instance->physicalDevice);
+   }
+
    instance->pfnFree(instance->pAllocUserData, instance);
 
    return VK_SUCCESS;
@@ -164,8 +174,8 @@ VkResult anv_EnumeratePhysicalDevices(
    VkResult result;
 
    if (instance->physicalDeviceCount == 0) {
-      result = fill_physical_device(&instance->physicalDevice,
-                                    instance, "/dev/dri/renderD128");
+      result = anv_physical_device_init(&instance->physicalDevice,
+                                        instance, "/dev/dri/renderD128");
       if (result != VK_SUCCESS)
          return result;