From d26b05f7fa4d79202cfa54f1864a88eccbac39e9 Mon Sep 17 00:00:00 2001
From: Jeremy Hayes <jeremy@lunarg.com>
Date: Thu, 21 Apr 2016 13:19:41 -0600
Subject: loader: fix LX475

Silently ignore VK_NULL_HANDLE in DestroyInstance/Device.

Change-Id: I96305088db75932b6f3f824852db9c72b8352120
---
 loader/trampoline.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'loader')

diff --git a/loader/trampoline.c b/loader/trampoline.c
index b4815784..f9264d7b 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -485,6 +485,10 @@ vkDestroyInstance(VkInstance instance,
     struct loader_instance *ptr_instance = NULL;
     bool callback_setup = false;
 
+    if (instance == VK_NULL_HANDLE) {
+        return;
+    }
+
     disp = loader_get_instance_dispatch(instance);
 
     loader_platform_thread_lock_mutex(&loader_lock);
@@ -772,6 +776,10 @@ vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) {
     const VkLayerDispatchTable *disp;
     struct loader_device *dev;
 
+    if (device == VK_NULL_HANDLE) {
+        return;
+    }
+
     loader_platform_thread_lock_mutex(&loader_lock);
 
     struct loader_icd *icd = loader_get_icd_and_device(device, &dev);
-- 
cgit v1.2.3