From 0600115afb68012bf20a3e75fdb7302776d59666 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Mon, 20 Apr 2015 11:04:54 -0600 Subject: vkEnumerateLayers: Update to match upstream The upstream vulkan.h header removed maxLayerCount parameter from vkEnumerateLayers. This patch implements that change for the sample driver and layers. --- layers/mem_tracker.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'layers/mem_tracker.cpp') diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index 6f5eb39f..45bea6f5 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -951,22 +951,22 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( return VK_SUCCESS; } -VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalDevice gpu, size_t maxLayerCount, - size_t maxStringSize, size_t* pOutLayerCount, char* const* pOutLayers, void* pReserved) +VK_LAYER_EXPORT VkResult VKAPI vkEnumerateLayers(VkPhysicalDevice gpu, + size_t maxStringSize, size_t* pLayerCount, char* const* pOutLayers, void* pReserved) { if (gpu != NULL) { pCurObj = (VkBaseLayerObject *) gpu; loader_platform_thread_once(&g_initOnce, initMemTracker); - VkResult result = nextTable.EnumerateLayers(gpu, maxLayerCount, - maxStringSize, pOutLayerCount, pOutLayers, pReserved); + VkResult result = nextTable.EnumerateLayers(gpu, + maxStringSize, pLayerCount, pOutLayers, pReserved); return result; } else { - if (pOutLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL) + if (pLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL) return VK_ERROR_INVALID_POINTER; // This layer compatible with all GPUs - *pOutLayerCount = 1; + *pLayerCount = 1; strncpy((char *) pOutLayers[0], "MemTracker", maxStringSize); return VK_SUCCESS; } -- cgit v1.2.3