commit d1f01d89e177ec51056b819c0aa71d49443e9fb8
author Jason Ekstrand <jason.ekstrand@intel.com> Wed Mar 01 08:39:49 2017 -0800
committer Emil Velikov <emil.l.velikov@gmail.com> Thu Mar 16 01:34:01 2017 +0000
tree e960ac06418afdebbb4096b953dcddfa4813b5b2
parent 0d7d4f973d17d74ea9a177c09a0b70bf7370b190

anv: Properly handle destroying NULL devices and instances

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: "17.0 13.0" <mesa-dev@lists.freedesktop.org>
(cherry picked from commit e3d33a23e6cbe2b73b412a56bb4fc4aa6852d081)

src/intel/vulkan/anv_device.c

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 67323e0..d7235ed 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -362,6 +362,9 @@
 {
    ANV_FROM_HANDLE(anv_instance, instance, _instance);
 
+   if (!instance)
+      return;
+
    if (instance->physicalDeviceCount > 0) {
       /* We support at most one physical device. */
       assert(instance->physicalDeviceCount == 1);
@@ -1006,6 +1009,9 @@
 {
    ANV_FROM_HANDLE(anv_device, device, _device);
 
+   if (!device)
+      return;
+
    anv_device_finish_blorp(device);
 
    anv_queue_finish(&device->queue);