Merge pull request #779 from krOoze/reapply_742

Apply #742 to `VkSubpassDependency2`: allow |, allow cond. rend.
This commit is contained in:
Jon Leech 2018-09-15 18:21:18 -07:00 committed by GitHub
commit 8c5de0a387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions

View File

@ -1099,8 +1099,8 @@ layouts as follows:
ename:VK_SUBPASS_EXTERNAL ename:VK_SUBPASS_EXTERNAL
* [[VUID-VkSubpassDependency-srcSubpass-01989]] * [[VUID-VkSubpassDependency-srcSubpass-01989]]
If pname:srcSubpass is equal to pname:dstSubpass, pname:srcStageMask and If pname:srcSubpass is equal to pname:dstSubpass, pname:srcStageMask and
pname:dstStageMask must: not set any bits that are not pname:dstStageMask must: not set any bits that are neither
ename:VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, or not one of the ename:VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, nor one of the
<<synchronization-pipeline-stages-types,graphics pipeline stages>> <<synchronization-pipeline-stages-types,graphics pipeline stages>>
* [[VUID-VkSubpassDependency-srcSubpass-00867]] * [[VUID-VkSubpassDependency-srcSubpass-00867]]
If pname:srcSubpass is equal to pname:dstSubpass and not all of the If pname:srcSubpass is equal to pname:dstSubpass and not all of the
@ -1802,22 +1802,10 @@ corresponding subpass dependency.
* [[VUID-VkSubpassDependency2KHR-srcSubpass-03085]] * [[VUID-VkSubpassDependency2KHR-srcSubpass-03085]]
pname:srcSubpass and pname:dstSubpass must: not both be equal to pname:srcSubpass and pname:dstSubpass must: not both be equal to
ename:VK_SUBPASS_EXTERNAL ename:VK_SUBPASS_EXTERNAL
* [[VUID-VkSubpassDependency2KHR-srcSubpass-03086]] * If pname:srcSubpass is equal to pname:dstSubpass, pname:srcStageMask and
If pname:srcSubpass is equal to pname:dstSubpass, pname:srcStageMask and pname:dstStageMask must: not set any bits that are neither
pname:dstStageMask must: only contain one of ename:VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, nor one of the
ename:VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, <<synchronization-pipeline-stages-types,graphics pipeline stages>>
ename:VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT,
ename:VK_PIPELINE_STAGE_VERTEX_INPUT_BIT,
ename:VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
ename:VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT,
ename:VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT,
ename:VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT,
ename:VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
ename:VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
ename:VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
ename:VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
ename:VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, or
ename:VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT
* [[VUID-VkSubpassDependency2KHR-srcSubpass-03087]] * [[VUID-VkSubpassDependency2KHR-srcSubpass-03087]]
If pname:srcSubpass is equal to pname:dstSubpass and not all of the If pname:srcSubpass is equal to pname:dstSubpass and not all of the
stages in pname:srcStageMask and pname:dstStageMask are stages in pname:srcStageMask and pname:dstStageMask are