diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-04-06 10:58:22 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:19 +0800 |
| commit | 18b1ec76dfd3aba5cfc0c9d34af2c142f62ce723 (patch) | |
| tree | 7d0cbee94d6079db53ea403b39b22b6832e5362c /layers/draw_state.cpp | |
| parent | 4166720ccf420b699f232dd277b9c8620f625e17 (diff) | |
| download | usermoji-18b1ec76dfd3aba5cfc0c9d34af2c142f62ce723.tar.xz | |
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)
Diffstat (limited to 'layers/draw_state.cpp')
| -rw-r--r-- | layers/draw_state.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<VkCmdBuffer, GLOBAL_CB_NODE*> cmdBufferMap; unordered_map<VkRenderPass, VkRenderPassCreateInfo*> renderPassMap; unordered_map<VkFramebuffer, VkFramebufferCreateInfo*> 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; |