From 7d31454a323282b747cf603990a94e824a3a2746 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 11 Jul 2015 11:05:01 +1200 Subject: layers: Fixup and reenable fs output validation in ShaderChecker Signed-off-by: Chris Forbes --- layers/shader_checker.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'layers/shader_checker.cpp') diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp index 9e5d71c1..1425b67d 100644 --- a/layers/shader_checker.cpp +++ b/layers/shader_checker.cpp @@ -836,9 +836,8 @@ validate_fs_outputs_against_render_pass(VkDevice dev, shader_module const *fs, r */ /* TODO: Figure out compile error with cb->attachmentCount */ -#if 0 - while ((outputs.size() > 0 && it != outputs.end()) || attachment < cb->attachmentCount) { - if (attachment == cb->attachmentCount || ( it != outputs.end() && it->first < attachment)) { + while ((outputs.size() > 0 && it != outputs.end()) || attachment < color_formats.size()) { + if (attachment == color_formats.size() || ( it != outputs.end() && it->first < attachment)) { log_msg(mdd(dev), VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_DEVICE, /*dev*/0, 0, SHADER_CHECKER_OUTPUT_NOT_CONSUMED, "SC", "FS writes to output location %d with no matching attachment", it->first); it++; @@ -868,7 +867,6 @@ validate_fs_outputs_against_render_pass(VkDevice dev, shader_module const *fs, r attachment++; } } -#endif return pass; } -- cgit v1.2.3