diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-06-26 13:05:57 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-06-28 10:57:05 -0600 |
| commit | 3e0fa34601ff17f612b58ebd52a586c4630be244 (patch) | |
| tree | 46f80d5fe7e40be2958b9d152f1e850d97ab9c17 /layers/parameter_validation.cpp | |
| parent | 2fbde9226361aaed79ca1dc0f63010a5e7af42df (diff) | |
| download | usermoji-3e0fa34601ff17f612b58ebd52a586c4630be244.tar.xz | |
layers: Add VUID parameter to pNext validation
In parameter_validation, plumbed VUID value through to validation
routine, added VUIDs for manual PV functions, updated generator to
compute correct VUID.
Change-Id: Ida15c874ba63826902fe93869cecac87415e0259
Diffstat (limited to 'layers/parameter_validation.cpp')
| -rw-r--r-- | layers/parameter_validation.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp index a1d641ef..ea56552a 100644 --- a/layers/parameter_validation.cpp +++ b/layers/parameter_validation.cpp @@ -1952,7 +1952,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli skip |= validate_struct_pnext( report_data, "vkCreateGraphicsPipelines", ParameterName("pCreateInfos[%i].pTessellationState->pNext", ParameterName::IndexVector{i}), NULL, - pCreateInfos[i].pTessellationState->pNext, 0, NULL, GeneratedHeaderVersion); + pCreateInfos[i].pTessellationState->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_0961c40d); skip |= validate_reserved_flags( report_data, "vkCreateGraphicsPipelines", @@ -2007,7 +2007,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli skip |= validate_struct_pnext( report_data, "vkCreateGraphicsPipelines", ParameterName("pCreateInfos[%i].pViewportState->pNext", ParameterName::IndexVector{i}), NULL, - pCreateInfos[i].pViewportState->pNext, 0, NULL, GeneratedHeaderVersion); + pCreateInfos[i].pViewportState->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_10c1c40d); skip |= validate_reserved_flags( report_data, "vkCreateGraphicsPipelines", @@ -2113,7 +2113,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli skip |= validate_struct_pnext( report_data, "vkCreateGraphicsPipelines", ParameterName("pCreateInfos[%i].pMultisampleState->pNext", ParameterName::IndexVector{i}), NULL, - pCreateInfos[i].pMultisampleState->pNext, 0, NULL, GeneratedHeaderVersion); + pCreateInfos[i].pMultisampleState->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_1001c40d); skip |= validate_reserved_flags( report_data, "vkCreateGraphicsPipelines", @@ -2156,7 +2156,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli skip |= validate_struct_pnext( report_data, "vkCreateGraphicsPipelines", ParameterName("pCreateInfos[%i].pDepthStencilState->pNext", ParameterName::IndexVector{i}), NULL, - pCreateInfos[i].pDepthStencilState->pNext, 0, NULL, GeneratedHeaderVersion); + pCreateInfos[i].pDepthStencilState->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_0f61c40d); skip |= validate_reserved_flags( report_data, "vkCreateGraphicsPipelines", @@ -2251,7 +2251,7 @@ VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, VkPipeli skip |= validate_struct_pnext( report_data, "vkCreateGraphicsPipelines", ParameterName("pCreateInfos[%i].pColorBlendState->pNext", ParameterName::IndexVector{i}), NULL, - pCreateInfos[i].pColorBlendState->pNext, 0, NULL, GeneratedHeaderVersion); + pCreateInfos[i].pColorBlendState->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_0f41c40d); skip |= validate_reserved_flags( report_data, "vkCreateGraphicsPipelines", @@ -3052,8 +3052,9 @@ VKAPI_ATTR VkResult VKAPI_CALL BeginCommandBuffer(VkCommandBuffer commandBuffer, VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, false, VALIDATION_ERROR_UNDEFINED); if (pBeginInfo->pInheritanceInfo != NULL) { - skip |= validate_struct_pnext(report_data, "vkBeginCommandBuffer", "pBeginInfo->pInheritanceInfo->pNext", NULL, - pBeginInfo->pInheritanceInfo->pNext, 0, NULL, GeneratedHeaderVersion); + skip |= + validate_struct_pnext(report_data, "vkBeginCommandBuffer", "pBeginInfo->pInheritanceInfo->pNext", NULL, + pBeginInfo->pInheritanceInfo->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_0281c40d); skip |= validate_bool32(report_data, "vkBeginCommandBuffer", "pBeginInfo->pInheritanceInfo->occlusionQueryEnable", pBeginInfo->pInheritanceInfo->occlusionQueryEnable); @@ -4159,7 +4160,7 @@ VKAPI_ATTR VkResult VKAPI_CALL QueuePresentKHR(VkQueue queue, const VkPresentInf pPresentInfo->swapchainCount, present_regions->swapchainCount); } skip |= validate_struct_pnext(my_data->report_data, "QueuePresentKHR", "pCreateInfo->pNext->pNext", NULL, - present_regions->pNext, 0, NULL, GeneratedHeaderVersion); + present_regions->pNext, 0, NULL, GeneratedHeaderVersion, VALIDATION_ERROR_1121c40d); skip |= validate_array(my_data->report_data, "QueuePresentKHR", "pCreateInfo->pNext->swapchainCount", "pCreateInfo->pNext->pRegions", present_regions->swapchainCount, present_regions->pRegions, true, false); |