OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Fix anv_pipeline_validate_create_info assertions.

Browse Source 
Many of these can be "NULL if the pipeline has rasterization disabled."
Also, we should assert that pMultisampleState exists.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke
2016-09-29 11:42:43 -07:00
parent 389d6dedbe
commit ba38a9d380
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/intel/vulkan/anv_pipeline.c
View File

@@ -953,8 +953,7 @@ anv_pipeline_validate_create_info(const VkGraphicsPipelineCreateInfo *info)
struct anv_subpass *subpass = NULL; struct anv_subpass *subpass = NULL;
/* Assert that all required members of VkGraphicsPipelineCreateInfo are /* Assert that all required members of VkGraphicsPipelineCreateInfo are
* present, as explained by the Vulkan (20 Oct 2015, git-aa308cb), Section * present. See the Vulkan 1.0.28 spec, Section 9.2 Graphics Pipelines.
* 4.2 Graphics Pipeline.
*/ */
assert(info->sType == VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO); assert(info->sType == VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO);
@@ -969,14 +968,17 @@ anv_pipeline_validate_create_info(const VkGraphicsPipelineCreateInfo *info)
assert(info->stageCount >= 1); assert(info->stageCount >= 1);
assert(info->pVertexInputState); assert(info->pVertexInputState);
assert(info->pInputAssemblyState); assert(info->pInputAssemblyState);
assert(info->pViewportState);
assert(info->pRasterizationState); assert(info->pRasterizationState);
if (!info->pRasterizationState->rasterizerDiscardEnable) {
assert(info->pViewportState);
assert(info->pMultisampleState);
if (subpass && subpass->depth_stencil_attachment != VK_ATTACHMENT_UNUSED) if (subpass && subpass->depth_stencil_attachment != VK_ATTACHMENT_UNUSED)
assert(info->pDepthStencilState); assert(info->pDepthStencilState);
if (subpass && subpass->color_count > 0) if (subpass && subpass->color_count > 0)
assert(info->pColorBlendState); assert(info->pColorBlendState);
}
for (uint32_t i = 0; i < info->stageCount; ++i) { for (uint32_t i = 0; i < info->stageCount; ++i) {
switch (info->pStages[i].stage) { switch (info->pStages[i].stage) {