From 26227f4921fa3bbad08ed65750a40efe1575d5ea Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Wed, 20 Jan 2016 08:07:14 -0700 Subject: [PATCH] layers: Remove obsolete VkbaseLayerObject --- include/vulkan/vk_layer.h | 10 ++-------- vk-layer-generate.py | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index b9c4429..90cd82d 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -15,13 +15,7 @@ # define VK_LAYER_EXPORT #endif -typedef void * (VKAPI_PTR *PFN_vkGPA)(void* obj, const char * pName); -typedef struct VkBaseLayerObject_ -{ - PFN_vkGPA pGPA; - void* nextObject; - void* baseObject; -} VkBaseLayerObject; + typedef struct VkLayerDispatchTable_ { @@ -233,7 +227,7 @@ typedef enum VkLayerFunction_ * When creating the device chain the loader needs to pass * down information about it's device structure needed at * the end of the chain. Passing the data via the - * VkLayerDeviceInfo avoids issues with finding the + * VkLayerInstanceInfo avoids issues with finding the * exact instance being used. */ typedef struct VkLayerInstanceInfo_ { diff --git a/vk-layer-generate.py b/vk-layer-generate.py index d243596..aafa8b4 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1011,7 +1011,6 @@ class APIDumpSubcommand(Subcommand): header_txt.append('}') header_txt.append('') header_txt.append('%s' % self.lineinfo.get()) - header_txt.append('static VkBaseLayerObject *pCurObj;') header_txt.append('static bool g_APIDumpDetailed = true;') header_txt.append('') header_txt.append('static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(initOnce);') -- 2.7.4