aboutsummaryrefslogtreecommitdiff
path: root/layers/mem_tracker.cpp
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtney@LunarG.com>2015-04-20 11:04:54 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-04-22 10:48:24 -0600
commit0600115afb68012bf20a3e75fdb7302776d59666 (patch)
tree689025f095d4eec2381acb85df81b264797290ad /layers/mem_tracker.cpp
parentb11da8f8b52bc770a3203f7b017aba94a784d845 (diff)
downloadusermoji-0600115afb68012bf20a3e75fdb7302776d59666.tar.xz
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.
Diffstat (limited to 'layers/mem_tracker.cpp')
-rw-r--r--layers/mem_tracker.cpp12
1 files changed, 6 insertions, 6 deletions
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;
}