diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-20 11:04:54 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-22 10:48:24 -0600 |
| commit | 0600115afb68012bf20a3e75fdb7302776d59666 (patch) | |
| tree | 689025f095d4eec2381acb85df81b264797290ad /layers/shader_checker.cpp | |
| parent | b11da8f8b52bc770a3203f7b017aba94a784d845 (diff) | |
| download | usermoji-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/shader_checker.cpp')
| -rw-r--r-- | layers/shader_checker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |
