commit 230e62505478ab0d9b05003e0e48baa5f090c6a0
author Mike Stroyan <mike@LunarG.com> Fri Apr 17 12:36:38 2015 -0600
committer Mike Stroyan <mike@LunarG.com> Fri Apr 17 20:40:58 2015 -0600
tree 22c4e0d9b600b85e2b659f96c813368dd565e4f6
parent d33b1dee7ba59f9a086312fa0dde6cecb8f8208e

update to vulkan.h header version 90, bug 13529

vk-layer-generate.py

diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 8bcc132..ee9ce17 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -374,7 +374,7 @@
                          "{\n"
                          "    VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu;\n"
                          "    void* addr;\n"
-                         "    if (gpu == NULL)\n"
+                         "    if (gpu == VK_NULL_HANDLE)\n"
                          "        return NULL;\n"
                          "    pCurObj = gpuw;\n"
                          "    loader_platform_thread_once(&tabOnce, init%s);\n\n"
@@ -481,7 +481,7 @@
             funcs.append('%s%s\n'
                      '{\n'
                      '    char str[1024];\n'
-                     '    if (gpu != NULL) {\n'
+                     '    if (gpu != VK_NULL_HANDLE) {\n'
                      '        sprintf(str, "At start of layered %s\\n");\n'
                      '        layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, gpu, 0, 0, (char *) "GENERIC", (char *) str);\n'
                      '        pCurObj = (VkBaseLayerObject *) gpu;\n'
@@ -1133,7 +1133,7 @@
             return None
         obj_type_mapping = {base_t : base_t.replace("Vk", "VkObjectType") for base_t in vulkan.object_type_list}
         # For the various "super-types" we have to use function to distinguish sub type
-        for obj_type in ["VK_BASE_OBJECT", "VK_OBJECT", "VK_DYNAMIC_STATE_OBJECT", "VkObject", "VkBaseObject"]:
+        for obj_type in ["VK_BASE_OBJECT", "VK_OBJECT", "VK_DYNAMIC_STATE_OBJECT", "VkObject"]:
             obj_type_mapping[obj_type] = "ll_get_obj_type(object)"
 
         decl = proto.c_func(prefix="vk", attr="VKAPI")