aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobin Ehlis <tobin@lunarg.com>2015-05-21 09:06:56 -0600
committerTobin Ehlis <tobin@lunarg.com>2015-05-22 12:43:31 -0600
commitd9c0d09edcf685d3c73d5674cc97125f4ef77820 (patch)
tree744a883790acfe830480f4cdc95f29e9dde2fb6f
parent8faa05b675ddba32ba62dfab3eb7f8e119039426 (diff)
downloadusermoji-d9c0d09edcf685d3c73d5674cc97125f4ef77820.tar.xz
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.
-rwxr-xr-xlayers/draw_state.cpp4
1 files changed, 2 insertions, 2 deletions
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 {