diff options
| author | Chris Forbes <chrisforbes@google.com> | 2016-10-26 12:40:31 +1300 |
|---|---|---|
| committer | Chris Forbes <chrisforbes@google.com> | 2016-11-01 09:57:57 +1300 |
| commit | 252fd2b3d2c9f4eaccc05a70b506c6c85ba13e20 (patch) | |
| tree | 75237a81c845b56b390cabd4ea7d471aa9e6b482 | |
| parent | 21560731fb702a9a6e6ce562c2a6a1f215fc05ce (diff) | |
| download | usermoji-252fd2b3d2c9f4eaccc05a70b506c6c85ba13e20.tar.xz | |
layers: Validate VkClearAttachment::aspectMask against aspects present
Fixes #1085
Signed-off-by: Chris Forbes <chrisforbes@google.com>
| -rw-r--r-- | layers/core_validation.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 547e403a..761d0aab 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -8651,9 +8651,12 @@ VKAPI_ATTR void VKAPI_CALL CmdClearAttachments(VkCommandBuffer commandBuffer, ui if (pCB->activeRenderPass) { const VkRenderPassCreateInfo *pRPCI = pCB->activeRenderPass->createInfo.ptr(); const VkSubpassDescription *pSD = &pRPCI->pSubpasses[pCB->activeSubpass]; + auto framebuffer = getFramebufferState(dev_data, pCB->activeFramebuffer); for (uint32_t i = 0; i < attachmentCount; i++) { auto clear_desc = &pAttachments[i]; + VkImageView image_view = VK_NULL_HANDLE; + if (clear_desc->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) { if (clear_desc->colorAttachment >= pSD->colorAttachmentCount) { skip_call |= log_msg( @@ -8669,6 +8672,9 @@ VKAPI_ATTR void VKAPI_CALL CmdClearAttachments(VkCommandBuffer commandBuffer, ui "vkCmdClearAttachments() color attachment index %d is VK_ATTACHMENT_UNUSED; ignored", clear_desc->colorAttachment); } + else { + image_view = framebuffer->createInfo.pAttachments[pSD->pColorAttachments[clear_desc->colorAttachment].attachment]; + } } else if (clear_desc->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { if (!pSD->pDepthStencilAttachment || // Says no DS will be used in active subpass (pSD->pDepthStencilAttachment->attachment == @@ -8679,6 +8685,23 @@ VKAPI_ATTR void VKAPI_CALL CmdClearAttachments(VkCommandBuffer commandBuffer, ui (uint64_t)commandBuffer, __LINE__, DRAWSTATE_MISSING_ATTACHMENT_REFERENCE, "DS", "vkCmdClearAttachments() depth/stencil clear with no depth/stencil attachment in subpass; ignored"); } + else { + image_view = framebuffer->createInfo.pAttachments[pSD->pDepthStencilAttachment->attachment]; + } + } + + if (image_view) { + auto image_view_state = getImageViewState(dev_data, image_view); + auto aspects_present = image_view_state->create_info.subresourceRange.aspectMask; + auto extra_aspects = clear_desc->aspectMask & ~aspects_present; + + if (extra_aspects) { + skip_call |= log_msg( + dev_data->report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_VIEW_EXT, + reinterpret_cast<uint64_t &>(image_view), __LINE__, DRAWSTATE_INVALID_IMAGE_ASPECT, "DS", + "vkCmdClearAttachments() with aspects not present in image view: %s", + string_VkImageAspectFlagBits((VkImageAspectFlagBits)extra_aspects)); + } } } } |