Merge pull request #742 from krOoze/fix_ifdef_in_vu

Fix VkSubpassDependency self-dependency stage VU
This commit is contained in:
Jon Leech 2018-07-23 00:41:47 -07:00 committed by GitHub
commit 6284e052d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 21 deletions

View File

@ -1097,25 +1097,10 @@ layouts as follows:
* [[VUID-VkSubpassDependency-srcSubpass-00865]] * [[VUID-VkSubpassDependency-srcSubpass-00865]]
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-VkSubpassDependency-srcSubpass-00866]] * 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: only contain one of ename:VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, or not one of the
ename:VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, <<synchronization-pipeline-stages-types,graphics pipeline stages>>
ifdef::VK_EXT_conditional_rendering[]
ename:VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT,
endif::VK_EXT_conditional_rendering[]
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-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
stages in pname:srcStageMask and pname:dstStageMask are stages in pname:srcStageMask and pname:dstStageMask are

View File

@ -549,8 +549,9 @@ guaranteed:
* ename:VK_PIPELINE_STAGE_HOST_BIT * ename:VK_PIPELINE_STAGE_HOST_BIT
ifdef::VK_EXT_conditional_rendering[] ifdef::VK_EXT_conditional_rendering[]
For conditional rendering operations, the pipeline stage where predicate The conditional rendering stage is formally part of both the graphics, and
read happens has no particular order relative to other stages. the compute pipeline. The pipeline stage where the predicate read happens
has unspecified order relative to other stages of these pipelines:
* ename:VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT * ename:VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT
endif::VK_EXT_conditional_rendering[] endif::VK_EXT_conditional_rendering[]