From 0ec1475b5961db79fa9486c5eceb4526ffdd7ee0 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 29 Jun 2016 18:15:41 +1200 Subject: layers: Simplify draw-time subpass sample count handling Renderpass creation has already failed for any cases that would hit this logic. Signed-off-by: Chris Forbes --- layers/core_validation.cpp | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index dd13079f..a71c5bfc 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -2859,31 +2859,18 @@ static bool validatePipelineDrawtimeState(layer_data const *my_data, reinterpret_cast(pPipeline->pipeline)); } - VkSampleCountFlagBits subpass_num_samples = VkSampleCountFlagBits(0); + unsigned subpass_num_samples = 0; for (i = 0; i < subpass_desc->colorAttachmentCount; i++) { - VkSampleCountFlagBits samples; - - if (subpass_desc->pColorAttachments[i].attachment == VK_ATTACHMENT_UNUSED) - continue; - - samples = render_pass_info->pAttachments[subpass_desc->pColorAttachments[i].attachment].samples; - if (subpass_num_samples == static_cast(0)) { - subpass_num_samples = samples; - } else if (subpass_num_samples != samples) { - subpass_num_samples = static_cast(-1); - break; - } + auto attachment = subpass_desc->pColorAttachments[i].attachment; + if (attachment != VK_ATTACHMENT_UNUSED) + subpass_num_samples |= (unsigned)render_pass_info->pAttachments[attachment].samples; } - if ((subpass_desc->pDepthStencilAttachment != NULL) && - (subpass_desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED)) { - const VkSampleCountFlagBits samples = - render_pass_info->pAttachments[subpass_desc->pDepthStencilAttachment->attachment].samples; - if (subpass_num_samples == static_cast(0)) - subpass_num_samples = samples; - else if (subpass_num_samples != samples) - subpass_num_samples = static_cast(-1); + if (subpass_desc->pDepthStencilAttachment && + subpass_desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) { + auto attachment = subpass_desc->pDepthStencilAttachment->attachment; + subpass_num_samples |= (unsigned)render_pass_info->pAttachments[attachment].samples; } if (subpass_num_samples && pso_num_samples != subpass_num_samples) { -- cgit v1.2.3