commit ff77404307834b27ae70ff0679a09dc8def31118
author Lenny Komow <lenny@lunarg.com> Wed Dec 11 15:09:29 2019 -0700
committer Lenny Komow <lenny@lunarg.com> Wed Dec 11 16:37:19 2019 -0700
tree c60f7ec7e94fd62974b46e06bc62ab6737ee27b4
parent 1830f45ee904b685a6f8c7137409890df9f349f8

codegen: Fix crash in tooling info terminator

Change-Id: I5835b73874bd3a8de9330c3244f456545c342ff3

loader/generated/vk_loader_extensions.c

diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c
index 8193376..06d9ce8 100644
--- a/loader/generated/vk_loader_extensions.c
+++ b/loader/generated/vk_loader_extensions.c
@@ -3235,7 +3235,11 @@
     const VkLayerInstanceDispatchTable *disp;
     VkPhysicalDevice unwrapped_phys_dev = loader_unwrap_physical_device(physicalDevice);
     disp = loader_get_instance_layer_dispatch(physicalDevice);
-    return disp->GetPhysicalDeviceToolPropertiesEXT(unwrapped_phys_dev, pToolCount, pToolProperties);
+    if (disp->GetPhysicalDeviceToolPropertiesEXT != NULL) {
+        return disp->GetPhysicalDeviceToolPropertiesEXT(unwrapped_phys_dev, pToolCount, pToolProperties);
+    } else {
+        return VK_SUCCESS;
+    }
 }
 
 VKAPI_ATTR VkResult VKAPI_CALL terminator_GetPhysicalDeviceToolPropertiesEXT(

scripts/loader_extension_generator.py

diff --git a/scripts/loader_extension_generator.py b/scripts/loader_extension_generator.py
index 90ca158..bd5abd3 100644
--- a/scripts/loader_extension_generator.py
+++ b/scripts/loader_extension_generator.py
@@ -49,7 +49,8 @@
 
 AVOID_EXT_NAMES = ['VK_EXT_debug_report']
 
-NULL_CHECK_EXT_NAMES= ['VK_EXT_debug_utils']
+NULL_CHECK_EXT_NAMES= ['VK_EXT_debug_utils',
+                       'VK_EXT_tooling_info']
 
 AVOID_CMD_NAMES = ['vkCreateDebugUtilsMessengerEXT',
                    'vkDestroyDebugUtilsMessengerEXT',