From 21f7f79ab1e0bf4d80626692dd53a95ebafe9334 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 3 May 2018 17:36:39 -0700 Subject: layers: Rework attachment use conflict checks Previously buffer_validation covered part of this, but not everything. V2: - Fix repeated ATTACHMENT_RESOLVE where I meant ATTACHMENT_PRESERVE - Fix camelcase noise in a bunch of places - Rename VkAttachmentReference& variables to attachment_ref to avoid attachment.attachment etc. - clang-format tidy-up - Move positive case to VkPositiveLayerTest --- layers/buffer_validation.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'layers/buffer_validation.cpp') diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp index cb548703..dd44c7a5 100644 --- a/layers/buffer_validation.cpp +++ b/layers/buffer_validation.cpp @@ -2860,22 +2860,6 @@ bool ValidateLayouts(core_validation::layer_data *device_data, VkDevice device, string_VkImageLayout(subpass.pInputAttachments[j].layout)); } - VkImageLayout layout = subpass.pInputAttachments[j].layout; - bool found_layout_mismatch = subpass.pDepthStencilAttachment && - subpass.pDepthStencilAttachment->attachment == attach_index && - subpass.pDepthStencilAttachment->layout != layout; - for (uint32_t c = 0; !found_layout_mismatch && c < subpass.colorAttachmentCount; ++c) { - found_layout_mismatch = - (subpass.pColorAttachments[c].attachment == attach_index && subpass.pColorAttachments[c].layout != layout); - } - if (found_layout_mismatch) { - skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, - VALIDATION_ERROR_140006ae, - "CreateRenderPass: Subpass %u pInputAttachments[%u] (%u) has layout %u, but is also used as a " - "depth/color attachment with a different layout.", - i, j, attach_index, layout); - } - if (attach_first_use[attach_index]) { skip |= ValidateLayoutVsAttachmentDescription(report_data, subpass.pInputAttachments[j].layout, attach_index, pCreateInfo->pAttachments[attach_index]); -- cgit v1.2.3