From 6cd982c9c7cbd43bcc8ad4d4edfa1c7d4e9b7bd8 Mon Sep 17 00:00:00 2001 From: Dave Houlton Date: Wed, 17 Jan 2018 10:13:33 -0700 Subject: layers: clang-format parameter_validation_utils.cpp Change-Id: I3ade2b8c7dc63f0b902b17d8cc3f9c48ca21fb23 --- layers/parameter_validation_utils.cpp | 76 ++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp index 79d50a44..817c1503 100644 --- a/layers/parameter_validation_utils.cpp +++ b/layers/parameter_validation_utils.cpp @@ -91,7 +91,10 @@ static void init_parameter_validation(instance_layer_data *instance_data, const static const VkExtensionProperties instance_extensions[] = {{VK_EXT_DEBUG_REPORT_EXTENSION_NAME, VK_EXT_DEBUG_REPORT_SPEC_VERSION}}; static const VkLayerProperties global_layer = { - "VK_LAYER_LUNARG_parameter_validation", VK_LAYER_API_VERSION, 1, "LunarG Validation Layer", + "VK_LAYER_LUNARG_parameter_validation", + VK_LAYER_API_VERSION, + 1, + "LunarG Validation Layer", }; static const int MaxParamCheckerStringLength = 256; @@ -476,7 +479,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice physicalDevice, c } } if (enabled_features_found) { - my_device_data->physical_device_features = *enabled_features_found; + my_device_data->physical_device_features = *enabled_features_found; } else { memset(&my_device_data->physical_device_features, 0, sizeof(VkPhysicalDeviceFeatures)); } @@ -577,7 +580,8 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateRenderPass(VkDevice device, const VkRende std::unique_lock lock(global_lock); skip |= parameter_validation_vkCreateRenderPass(device, pCreateInfo, pAllocator, pRenderPass); - typedef bool (*PFN_manual_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass); + typedef bool (*PFN_manual_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass); PFN_manual_vkCreateRenderPass custom_func = (PFN_manual_vkCreateRenderPass)custom_functions["vkCreateRenderPass"]; if (custom_func != nullptr) { skip |= custom_func(device, pCreateInfo, pAllocator, pRenderPass); @@ -619,7 +623,8 @@ VKAPI_ATTR void VKAPI_CALL vkDestroyRenderPass(VkDevice device, VkRenderPass ren std::unique_lock lock(global_lock); skip |= parameter_validation_vkDestroyRenderPass(device, renderPass, pAllocator); - typedef bool (*PFN_manual_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass, const VkAllocationCallbacks* pAllocator); + typedef bool (*PFN_manual_vkDestroyRenderPass)(VkDevice device, VkRenderPass renderPass, + const VkAllocationCallbacks *pAllocator); PFN_manual_vkDestroyRenderPass custom_func = (PFN_manual_vkDestroyRenderPass)custom_functions["vkDestroyRenderPass"]; if (custom_func != nullptr) { skip |= custom_func(device, renderPass, pAllocator); @@ -1266,10 +1271,9 @@ bool pv_vkCreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache "is VK_FALSE, pCreateInfos[%d].pMultisampleState must not be NULL. %s", i, i, validation_error_map[VALIDATION_ERROR_096005de]); } else { - const VkStructureType valid_next_stypes[] = { - LvlTypeMap::kSType, - LvlTypeMap::kSType, - LvlTypeMap::kSType}; + const VkStructureType valid_next_stypes[] = {LvlTypeMap::kSType, + LvlTypeMap::kSType, + LvlTypeMap::kSType}; const char *valid_struct_names = "VkPipelineCoverageModulationStateCreateInfoNV, " "VkPipelineCoverageToColorStateCreateInfoNV, " @@ -2677,35 +2681,35 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetPhysicalDeviceProcAddr(VkInstance // If additional validation is needed outside of the generated checks, a manual routine can be added to this file // and the address filled in here. The autogenerated source will call these routines if the pointers are not NULL. void InitializeManualParameterValidationFunctionPointers() { - custom_functions["vkGetDeviceQueue"] = (void*)pv_vkGetDeviceQueue; - custom_functions["vkCreateBuffer"] = (void*)pv_vkCreateBuffer; - custom_functions["vkCreateImage"] = (void*)pv_vkCreateImage; - custom_functions["vkCreateImageView"] = (void*)pv_vkCreateImageView; - custom_functions["vkCreateGraphicsPipelines"] = (void*)pv_vkCreateGraphicsPipelines; - custom_functions["vkCreateComputePipelines"] = (void*)pv_vkCreateComputePipelines; - custom_functions["vkCreateSampler"] = (void*)pv_vkCreateSampler; - custom_functions["vkCreateDescriptorSetLayout"] = (void*)pv_vkCreateDescriptorSetLayout; - custom_functions["vkFreeDescriptorSets"] = (void*)pv_vkFreeDescriptorSets; - custom_functions["vkUpdateDescriptorSets"] = (void*)pv_vkUpdateDescriptorSets; - custom_functions["vkCreateRenderPass"] = (void*)pv_vkCreateRenderPass; - custom_functions["vkBeginCommandBuffer"] = (void*)pv_vkBeginCommandBuffer; - custom_functions["vkCmdSetViewport"] = (void*)pv_vkCmdSetViewport; - custom_functions["vkCmdSetScissor"] = (void*)pv_vkCmdSetScissor; + custom_functions["vkGetDeviceQueue"] = (void *)pv_vkGetDeviceQueue; + custom_functions["vkCreateBuffer"] = (void *)pv_vkCreateBuffer; + custom_functions["vkCreateImage"] = (void *)pv_vkCreateImage; + custom_functions["vkCreateImageView"] = (void *)pv_vkCreateImageView; + custom_functions["vkCreateGraphicsPipelines"] = (void *)pv_vkCreateGraphicsPipelines; + custom_functions["vkCreateComputePipelines"] = (void *)pv_vkCreateComputePipelines; + custom_functions["vkCreateSampler"] = (void *)pv_vkCreateSampler; + custom_functions["vkCreateDescriptorSetLayout"] = (void *)pv_vkCreateDescriptorSetLayout; + custom_functions["vkFreeDescriptorSets"] = (void *)pv_vkFreeDescriptorSets; + custom_functions["vkUpdateDescriptorSets"] = (void *)pv_vkUpdateDescriptorSets; + custom_functions["vkCreateRenderPass"] = (void *)pv_vkCreateRenderPass; + custom_functions["vkBeginCommandBuffer"] = (void *)pv_vkBeginCommandBuffer; + custom_functions["vkCmdSetViewport"] = (void *)pv_vkCmdSetViewport; + custom_functions["vkCmdSetScissor"] = (void *)pv_vkCmdSetScissor; custom_functions["vkCmdSetLineWidth"] = (void *)pv_vkCmdSetLineWidth; - custom_functions["vkCmdDraw"] = (void*)pv_vkCmdDraw; - custom_functions["vkCmdDrawIndirect"] = (void*)pv_vkCmdDrawIndirect; - custom_functions["vkCmdDrawIndexedIndirect"] = (void*)pv_vkCmdDrawIndexedIndirect; - custom_functions["vkCmdCopyImage"] = (void*)pv_vkCmdCopyImage; - custom_functions["vkCmdBlitImage"] = (void*)pv_vkCmdBlitImage; - custom_functions["vkCmdCopyBufferToImage"] = (void*)pv_vkCmdCopyBufferToImage; - custom_functions["vkCmdCopyImageToBuffer"] = (void*)pv_vkCmdCopyImageToBuffer; - custom_functions["vkCmdUpdateBuffer"] = (void*)pv_vkCmdUpdateBuffer; - custom_functions["vkCmdFillBuffer"] = (void*)pv_vkCmdFillBuffer; - custom_functions["vkCreateSwapchainKHR"] = (void*)pv_vkCreateSwapchainKHR; - custom_functions["vkQueuePresentKHR"] = (void*)pv_vkQueuePresentKHR; - custom_functions["vkCreateDescriptorPool"] = (void*)pv_vkCreateDescriptorPool; - custom_functions["vkCmdDispatch"] = (void*)pv_vkCmdDispatch; - custom_functions["vkCmdDispatchBaseKHX"] = (void*)pv_vkCmdDispatchBaseKHX; + custom_functions["vkCmdDraw"] = (void *)pv_vkCmdDraw; + custom_functions["vkCmdDrawIndirect"] = (void *)pv_vkCmdDrawIndirect; + custom_functions["vkCmdDrawIndexedIndirect"] = (void *)pv_vkCmdDrawIndexedIndirect; + custom_functions["vkCmdCopyImage"] = (void *)pv_vkCmdCopyImage; + custom_functions["vkCmdBlitImage"] = (void *)pv_vkCmdBlitImage; + custom_functions["vkCmdCopyBufferToImage"] = (void *)pv_vkCmdCopyBufferToImage; + custom_functions["vkCmdCopyImageToBuffer"] = (void *)pv_vkCmdCopyImageToBuffer; + custom_functions["vkCmdUpdateBuffer"] = (void *)pv_vkCmdUpdateBuffer; + custom_functions["vkCmdFillBuffer"] = (void *)pv_vkCmdFillBuffer; + custom_functions["vkCreateSwapchainKHR"] = (void *)pv_vkCreateSwapchainKHR; + custom_functions["vkQueuePresentKHR"] = (void *)pv_vkQueuePresentKHR; + custom_functions["vkCreateDescriptorPool"] = (void *)pv_vkCreateDescriptorPool; + custom_functions["vkCmdDispatch"] = (void *)pv_vkCmdDispatch; + custom_functions["vkCmdDispatchBaseKHX"] = (void *)pv_vkCmdDispatchBaseKHX; } } // namespace parameter_validation -- cgit v1.2.3