From 18b1ec76dfd3aba5cfc0c9d34af2c142f62ce723 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Mon, 6 Apr 2015 10:58:22 -0600 Subject: loader: refactor layer activation function to handle more general inputs Renamed structure types as well. TODO: verify vk-layer-generate.py v2: fix LoaderEntrypointsSubcommand (olv) --- layers/basic.cpp | 30 ++++++++++++------------- layers/draw_state.cpp | 12 +++++----- layers/glave_snapshot.c | 2 +- layers/mem_tracker.cpp | 12 +++++----- layers/multi.cpp | 58 ++++++++++++++++++++++++------------------------ layers/param_checker.cpp | 18 +++++++-------- 6 files changed, 66 insertions(+), 66 deletions(-) (limited to 'layers') diff --git a/layers/basic.cpp b/layers/basic.cpp index 9501c13e..3854577c 100644 --- a/layers/basic.cpp +++ b/layers/basic.cpp @@ -32,17 +32,17 @@ // being used: #include "loader_platform.h" -static std::unordered_map tableMap; +static std::unordered_map tableMap; -static VK_LAYER_DISPATCH_TABLE * initLayerTable(const VK_BASE_LAYER_OBJECT *gpuw) +static VkLayerDispatchTable * initLayerTable(const VkBaseLayerObject *gpuw) { - VK_LAYER_DISPATCH_TABLE *pTable; + VkLayerDispatchTable *pTable; assert(gpuw); - std::unordered_map::const_iterator it = tableMap.find((void *) gpuw); + std::unordered_map::const_iterator it = tableMap.find((void *) gpuw); if (it == tableMap.end()) { - pTable = new VK_LAYER_DISPATCH_TABLE; + pTable = new VkLayerDispatchTable; tableMap[(void *) gpuw] = pTable; } else { @@ -64,7 +64,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkLayerExtension1(VkDevice device) VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName) { VkResult result; - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */ if (!strncmp(pExtName, "vkLayerExtension1", strlen("vkLayerExtension1"))) @@ -76,7 +76,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const ch } else if (!tableMap.empty() && (tableMap.find(gpuw) != tableMap.end())) { printf("At start of wrapped vkGetExtensionSupport() call w/ gpu: %p\n", (void*)gpu); - VK_LAYER_DISPATCH_TABLE* pTable = tableMap[gpuw]; + VkLayerDispatchTable* pTable = tableMap[gpuw]; result = pTable->GetExtensionSupport((VkPhysicalGpu)gpuw->nextObject, pExtName); printf("Completed wrapped vkGetExtensionSupport() call w/ gpu: %p\n", (void*)gpu); } else @@ -88,8 +88,8 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const ch VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = tableMap[gpuw]; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = tableMap[gpuw]; printf("At start of wrapped vkCreateDevice() call w/ gpu: %p\n", (void*)gpu); VkResult result = pTable->CreateDevice((VkPhysicalGpu)gpuw->nextObject, pCreateInfo, pDevice); @@ -100,7 +100,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalGpu gpu, const VkDeviceC } VK_LAYER_EXPORT VkResult VKAPI vkGetFormatInfo(VkDevice device, VkFormat format, VkFormatInfoType infoType, size_t* pDataSize, void* pData) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap[device]; + VkLayerDispatchTable* pTable = tableMap[device]; printf("At start of wrapped vkGetFormatInfo() call w/ device: %p\n", (void*)device); VkResult result = pTable->GetFormatInfo(device, format, infoType, pDataSize, pData); @@ -112,8 +112,8 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa { if (gpu != NULL) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = initLayerTable(gpuw); + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = initLayerTable(gpuw); printf("At start of wrapped vkEnumerateLayers() call w/ gpu: %p\n", gpu); VkResult result = pTable->EnumerateLayers((VkPhysicalGpu)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); @@ -124,7 +124,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa return VK_ERROR_INVALID_POINTER; // Example of a layer that is only compatible with Intel's GPUs - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT*) pReserved; + VkBaseLayerObject* gpuw = (VkBaseLayerObject*) pReserved; PFN_vkGetGpuInfo fpGetGpuInfo; VkPhysicalGpuProperties gpuProps; size_t dataSize = sizeof(VkPhysicalGpuProperties); @@ -147,7 +147,7 @@ VK_LAYER_EXPORT void * VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* pName) if (gpu == NULL) return NULL; - initLayerTable((const VK_BASE_LAYER_OBJECT *) gpu); + initLayerTable((const VkBaseLayerObject *) gpu); if (!strncmp("vkGetProcAddr", pName, sizeof("vkGetProcAddr"))) return (void *) vkGetProcAddr; @@ -162,7 +162,7 @@ VK_LAYER_EXPORT void * VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* pName) else if (!strncmp("vkLayerExtension1", pName, sizeof("vkLayerExtension1"))) return (void *) vkLayerExtension1; else { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; if (gpuw->pGPA == NULL) return NULL; return gpuw->pGPA((VkPhysicalGpu) gpuw->nextObject, pName); diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 6ff0fcee..cb3e6833 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -54,8 +54,8 @@ unordered_map cmdBufferMap; unordered_map renderPassMap; unordered_map frameBufferMap; -static VK_LAYER_DISPATCH_TABLE nextTable; -static VK_BASE_LAYER_OBJECT *pCurObj; +static VkLayerDispatchTable nextTable; +static VkBaseLayerObject *pCurObj; static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); // TODO : This can be much smarter, using separate locks for separate global data static int globalLockInitialized = 0; @@ -1443,7 +1443,7 @@ static void initDrawState(void) VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initDrawState); VkResult result = nextTable.CreateDevice((VkPhysicalGpu)gpuw->nextObject, pCreateInfo, pDevice); @@ -1469,7 +1469,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyDevice(VkDevice device) VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; VkResult result; /* This entrypoint is NOT going to init its own dispatch table since loader calls here early */ if (!strcmp(pExtName, "DrawState") || !strcmp(pExtName, "drawStateDumpDotFile") || @@ -1490,7 +1490,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa { if (gpu != NULL) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initDrawState); VkResult result = nextTable.EnumerateLayers((VkPhysicalGpu)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); @@ -2690,7 +2690,7 @@ void drawStateDumpPngFile(char* outFileName) VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* funcName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; if (gpu == NULL) return NULL; diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c index 5180ed70..2c351573 100644 --- a/layers/glave_snapshot.c +++ b/layers/glave_snapshot.c @@ -32,7 +32,7 @@ #define LAYER_NAME_STR "GlaveSnapshot" #define LAYER_ABBREV_STR "GLVSnap" -static VK_LAYER_DISPATCH_TABLE nextTable; +static VkLayerDispatchTable nextTable; static VK_BASE_LAYER_OBJECT *pCurObj; // The following is #included again to catch certain OS-specific functions being used: diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index bde5950a..1a00669c 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -41,8 +41,8 @@ using namespace std; #include "loader_platform.h" #include "layers_msg.h" -static VK_LAYER_DISPATCH_TABLE nextTable; -static VK_BASE_LAYER_OBJECT *pCurObj; +static VkLayerDispatchTable nextTable; +static VkBaseLayerObject *pCurObj; static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(g_initOnce); // TODO : This can be much smarter, using separate locks for separate global data static int globalLockInitialized = 0; @@ -823,7 +823,7 @@ static void initMemTracker(void) VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initMemTracker); VkResult result = nextTable.CreateDevice((VkPhysicalGpu)gpuw->nextObject, pCreateInfo, pDevice); @@ -867,7 +867,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyDevice(VkDevice device) VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; VkResult result; /* This entrypoint is NOT going to init its own dispatch table since loader calls here early */ if (!strcmp(pExtName, "MemTracker")) @@ -888,7 +888,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa { if (gpu != NULL) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&g_initOnce, initMemTracker); VkResult result = nextTable.EnumerateLayers((VkPhysicalGpu)gpuw->nextObject, maxLayerCount, @@ -1905,7 +1905,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkWsiX11QueuePresent(VkQueue queue, const VK_WSI_ VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* funcName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; if (gpu == NULL) return NULL; diff --git a/layers/multi.cpp b/layers/multi.cpp index 1c9dc178..53286c57 100644 --- a/layers/multi.cpp +++ b/layers/multi.cpp @@ -34,21 +34,21 @@ // being used: #include "loader_platform.h" -static void initLayerTable(const VK_BASE_LAYER_OBJECT *gpuw, VK_LAYER_DISPATCH_TABLE *pTable, const unsigned int layerNum); +static void initLayerTable(const VkBaseLayerObject *gpuw, VkLayerDispatchTable *pTable, const unsigned int layerNum); /******************************** Layer multi1 functions **************************/ -static std::unordered_map tableMap1; +static std::unordered_map tableMap1; static bool layer1_first_activated = false; -static VK_LAYER_DISPATCH_TABLE * getLayer1Table(const VK_BASE_LAYER_OBJECT *gpuw) +static VkLayerDispatchTable * getLayer1Table(const VkBaseLayerObject *gpuw) { - VK_LAYER_DISPATCH_TABLE *pTable; + VkLayerDispatchTable *pTable; assert(gpuw); - std::unordered_map::const_iterator it = tableMap1.find((void *) gpuw); + std::unordered_map::const_iterator it = tableMap1.find((void *) gpuw); if (it == tableMap1.end()) { - pTable = new VK_LAYER_DISPATCH_TABLE; + pTable = new VkLayerDispatchTable; tableMap1[(void *) gpuw] = pTable; initLayerTable(gpuw, pTable, 1); return pTable; @@ -65,8 +65,8 @@ extern "C" { VK_LAYER_EXPORT VkResult VKAPI multi1CreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = getLayer1Table(gpuw); + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = getLayer1Table(gpuw); printf("At start of multi1 layer vkCreateDevice()\n"); VkResult result = pTable->CreateDevice((VkPhysicalGpu)gpuw->nextObject, pCreateInfo, pDevice); @@ -79,7 +79,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi1CreateDevice(VkPhysicalGpu gpu, const VkDev VK_LAYER_EXPORT VkResult VKAPI multi1CreateGraphicsPipeline(VkDevice device, const VkGraphicsPipelineCreateInfo* pCreateInfo, VkPipeline* pPipeline) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap1[device]; + VkLayerDispatchTable* pTable = tableMap1[device]; printf("At start of multi1 layer vkCreateGraphicsPipeline()\n"); VkResult result = pTable->CreateGraphicsPipeline(device, pCreateInfo, pPipeline); @@ -91,7 +91,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi1CreateGraphicsPipeline(VkDevice device, con VK_LAYER_EXPORT VkResult VKAPI multi1StorePipeline(VkPipeline pipeline, size_t* pDataSize, void* pData) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap1[pipeline]; + VkLayerDispatchTable* pTable = tableMap1[pipeline]; printf("At start of multi1 layer vkStorePipeline()\n"); VkResult result = pTable->StorePipeline(pipeline, pDataSize, pData); @@ -106,8 +106,8 @@ VK_LAYER_EXPORT VkResult VKAPI multi1EnumerateLayers(VkPhysicalGpu gpu, size_t m if (gpu == NULL) return vkEnumerateLayers(gpu, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = getLayer1Table(gpuw); + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = getLayer1Table(gpuw); printf("At start of multi1 layer vkEnumerateLayers()\n"); VkResult result = pTable->EnumerateLayers((VkPhysicalGpu)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); @@ -117,7 +117,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi1EnumerateLayers(VkPhysicalGpu gpu, size_t m VK_LAYER_EXPORT void * VKAPI multi1GetProcAddr(VkPhysicalGpu gpu, const char* pName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; if (gpu == NULL) return NULL; @@ -142,18 +142,18 @@ VK_LAYER_EXPORT void * VKAPI multi1GetProcAddr(VkPhysicalGpu gpu, const char* pN } /******************************** Layer multi2 functions **************************/ -static std::unordered_map tableMap2; +static std::unordered_map tableMap2; static bool layer2_first_activated = false; -static VK_LAYER_DISPATCH_TABLE * getLayer2Table(const VK_BASE_LAYER_OBJECT *gpuw) +static VkLayerDispatchTable * getLayer2Table(const VkBaseLayerObject *gpuw) { - VK_LAYER_DISPATCH_TABLE *pTable; + VkLayerDispatchTable *pTable; assert(gpuw); - std::unordered_map::const_iterator it = tableMap2.find((void *) gpuw); + std::unordered_map::const_iterator it = tableMap2.find((void *) gpuw); if (it == tableMap2.end()) { - pTable = new VK_LAYER_DISPATCH_TABLE; + pTable = new VkLayerDispatchTable; tableMap2[(void *) gpuw] = pTable; initLayerTable(gpuw, pTable, 2); return pTable; @@ -166,8 +166,8 @@ static VK_LAYER_DISPATCH_TABLE * getLayer2Table(const VK_BASE_LAYER_OBJECT *gpuw VK_LAYER_EXPORT VkResult VKAPI multi2CreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = getLayer2Table(gpuw); + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = getLayer2Table(gpuw); printf("At start of multi2 vkCreateDevice()\n"); VkResult result = pTable->CreateDevice((VkPhysicalGpu)gpuw->nextObject, pCreateInfo, pDevice); @@ -180,7 +180,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi2CreateDevice(VkPhysicalGpu gpu, const VkDev VK_LAYER_EXPORT VkResult VKAPI multi2CreateCommandBuffer(VkDevice device, const VkCmdBufferCreateInfo* pCreateInfo, VkCmdBuffer* pCmdBuffer) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap2[device]; + VkLayerDispatchTable* pTable = tableMap2[device]; printf("At start of multi2 layer vkCreateCommandBuffer()\n"); VkResult result = pTable->CreateCommandBuffer(device, pCreateInfo, pCmdBuffer); @@ -192,7 +192,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi2CreateCommandBuffer(VkDevice device, const VK_LAYER_EXPORT VkResult VKAPI multi2BeginCommandBuffer(VkCmdBuffer cmdBuffer, const VkCmdBufferBeginInfo* pBeginInfo) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap2[cmdBuffer]; + VkLayerDispatchTable* pTable = tableMap2[cmdBuffer]; printf("At start of multi2 layer vkBeginCommandBuffer()\n"); VkResult result = pTable->BeginCommandBuffer(cmdBuffer, pBeginInfo); @@ -208,8 +208,8 @@ VK_LAYER_EXPORT VkResult VKAPI multi2EnumerateLayers(VkPhysicalGpu gpu, size_t m if (gpu == NULL) return vkEnumerateLayers(gpu, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; - VK_LAYER_DISPATCH_TABLE* pTable = getLayer2Table(gpuw); + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; + VkLayerDispatchTable* pTable = getLayer2Table(gpuw); printf("At start of multi2 layer vkEnumerateLayers()\n"); VkResult result = pTable->EnumerateLayers((VkPhysicalGpu)gpuw->nextObject, maxLayerCount, maxStringSize, pOutLayerCount, pOutLayers, pReserved); @@ -219,7 +219,7 @@ VK_LAYER_EXPORT VkResult VKAPI multi2EnumerateLayers(VkPhysicalGpu gpu, size_t m VK_LAYER_EXPORT void * VKAPI multi2GetProcAddr(VkPhysicalGpu gpu, const char* pName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; if (gpu == NULL) return NULL; @@ -262,7 +262,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName) { VkResult result; - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */ if (!strncmp(pExtName, "multi1", strlen("multi1"))) @@ -273,11 +273,11 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const ch result = VK_SUCCESS; } else if (!tableMap1.empty() && (tableMap1.find(gpuw) != tableMap1.end())) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap1[gpuw]; + VkLayerDispatchTable* pTable = tableMap1[gpuw]; result = pTable->GetExtensionSupport((VkPhysicalGpu)gpuw->nextObject, pExtName); } else if (!tableMap2.empty() && (tableMap2.find(gpuw) != tableMap2.end())) { - VK_LAYER_DISPATCH_TABLE* pTable = tableMap2[gpuw]; + VkLayerDispatchTable* pTable = tableMap2[gpuw]; result = pTable->GetExtensionSupport((VkPhysicalGpu)gpuw->nextObject, pExtName); } else { @@ -310,7 +310,7 @@ VK_LAYER_EXPORT void * VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* pName) } //extern "C" #endif -static void initLayerTable(const VK_BASE_LAYER_OBJECT *gpuw, VK_LAYER_DISPATCH_TABLE *pTable, const unsigned int layerNum) +static void initLayerTable(const VkBaseLayerObject *gpuw, VkLayerDispatchTable *pTable, const unsigned int layerNum) { if (layerNum == 2 && layer1_first_activated == false) layer2_first_activated = true; diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index e11998f8..1ce946ae 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -40,8 +40,8 @@ #include "layers_msg.h" -static VK_LAYER_DISPATCH_TABLE nextTable; -static VK_BASE_LAYER_OBJECT *pCurObj; +static VkLayerDispatchTable nextTable; +static VkBaseLayerObject *pCurObj; static LOADER_PLATFORM_THREAD_ONCE_DECLARATION(tabOnce); #include "vk_dispatch_table_helper.h" @@ -148,7 +148,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateGpus(VkInstance instance, uint32_t max VK_LAYER_EXPORT VkResult VKAPI vkGetGpuInfo(VkPhysicalGpu gpu, VkPhysicalGpuInfoType infoType, size_t* pDataSize, void* pData) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&tabOnce, initParamChecker); char str[1024]; @@ -243,7 +243,7 @@ void PostCreateDevice(VkResult result, VkDevice* pDevice) VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&tabOnce, initParamChecker); PreCreateDevice(gpu, pCreateInfo); @@ -261,7 +261,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkDestroyDevice(VkDevice device) VK_LAYER_EXPORT VkResult VKAPI vkGetExtensionSupport(VkPhysicalGpu gpu, const char* pExtName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&tabOnce, initParamChecker); @@ -273,7 +273,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalGpu gpu, size_t maxLa { char str[1024]; if (gpu != NULL) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; sprintf(str, "At start of layered EnumerateLayers\n"); layerCbMsg(VK_DBG_MSG_UNKNOWN, VK_VALIDATION_LEVEL_0, nullptr, 0, 0, "PARAMCHECK", str); pCurObj = gpuw; @@ -386,7 +386,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkPinSystemMemory(VkDevice device, const void* pS VK_LAYER_EXPORT VkResult VKAPI vkGetMultiGpuCompatibility(VkPhysicalGpu gpu0, VkPhysicalGpu gpu1, VkGpuCompatibilityInfo* pInfo) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu0; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu0; pCurObj = gpuw; loader_platform_thread_once(&tabOnce, initParamChecker); @@ -1932,7 +1932,7 @@ VK_LAYER_EXPORT void VKAPI vkCmdDbgMarkerEnd(VkCmdBuffer cmdBuffer) VK_LAYER_EXPORT VkResult VKAPI vkWsiX11AssociateConnection(VkPhysicalGpu gpu, const VK_WSI_X11_CONNECTION_INFO* pConnectionInfo) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; pCurObj = gpuw; loader_platform_thread_once(&tabOnce, initParamChecker); @@ -1966,7 +1966,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkWsiX11QueuePresent(VkQueue queue, const VK_WSI_ #include "vk_generic_intercept_proc_helper.h" VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalGpu gpu, const char* funcName) { - VK_BASE_LAYER_OBJECT* gpuw = (VK_BASE_LAYER_OBJECT *) gpu; + VkBaseLayerObject* gpuw = (VkBaseLayerObject *) gpu; void* addr; if (gpu == NULL) return NULL; -- cgit v1.2.3