From d9c0d09edcf685d3c73d5674cc97125f4ef77820 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 21 May 2015 09:06:56 -0600 Subject: layers: Add additional check for RenderPass sampleCount Was checking PSO MSAA num samples against FrameBuffer sampleCount. This change adds an additional check against RenderPass sampleCount. --- layers/draw_state.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layers/draw_state.cpp') diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 7836198f..81faa128 100755 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -522,9 +522,9 @@ static void validatePipelineState(const GLOBAL_CB_NODE* pCB, const VkPipelineBin if (pCB->activeRenderPass) { VkRenderPassCreateInfo* pRPCI = renderPassMap[pCB->activeRenderPass]; VkFramebufferCreateInfo* pFBCI = frameBufferMap[pCB->framebuffer]; - if (psoNumSamples != pFBCI->sampleCount) { + if ((psoNumSamples != pFBCI->sampleCount) || (psoNumSamples != pRPCI->sampleCount)) { char str[1024]; - sprintf(str, "Num samples mismatche! Binding PSO (%p) with %u samples while current RenderPass (%p) uses FB (%p) with %u samples!", (void*)pipeline, psoNumSamples, (void*)pCB->activeRenderPass, (void*)pCB->framebuffer, pFBCI->sampleCount); + sprintf(str, "Num samples mismatche! Binding PSO (%p) with %u samples while current RenderPass (%p) w/ %u samples uses FB (%p) with %u samples!", (void*)pipeline, psoNumSamples, (void*)pCB->activeRenderPass, pRPCI->sampleCount, (void*)pCB->framebuffer, pFBCI->sampleCount); layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, pipeline, 0, DRAWSTATE_NUM_SAMPLES_MISMATCH, "DS", str); } } else { -- cgit v1.2.3