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/shader_checker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'layers/shader_checker.cpp') diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index cc6bb3e1..28e0fddc 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -161,14 +161,14 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDevi } -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 physicalDevice, size_t maxStringSize, size_t* pLayerCount, char* const* pOutLayers, void* pReserved) { - if (pOutLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL || pOutLayers[1] == NULL || pReserved == NULL) + if (pLayerCount == NULL || pOutLayers == NULL || pOutLayers[0] == NULL || pOutLayers[1] == NULL || pReserved == NULL) return VK_ERROR_INVALID_POINTER; - if (maxLayerCount < 1) + if (*pLayerCount < 1) return VK_ERROR_INITIALIZATION_FAILED; - *pOutLayerCount = 1; + *pLayerCount = 1; strncpy((char *) pOutLayers[0], "ShaderChecker", maxStringSize); return VK_SUCCESS; } -- cgit v1.2.3