commit 825e795dc1fc9439408a3e97937cc3c704ee1670
author Chris Forbes <chrisforbes@google.com> Thu May 03 17:10:50 2018 -0700
committer Chris Forbes <chrisf@ijw.co.nz> Tue May 08 15:42:02 2018 -0700
tree f6d2c4a9237ad47428f5191c93d2394cad1257c4
parent bda3c091d4b6fbccabd833e4d31f8dad46f6a552

layers: Do renderpass dag validation before call

Previously this would contribute to skip /after/ the call, which
accomplishes nothing.

layers/core_validation.cpp

diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 755699b..444f5e0 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -9135,6 +9135,12 @@
     // TODO: As part of wrapping up the mem_tracker/core_validation merge the following routine should be consolidated with
     //       ValidateLayouts.
     skip |= ValidateRenderpassAttachmentUsage(dev_data, pCreateInfo);
+
+    std::vector<bool> has_self_dependency(pCreateInfo->subpassCount);
+    std::vector<DAGNode> subpass_to_node(pCreateInfo->subpassCount);
+    std::vector<int32_t> subpass_to_dep_index(pCreateInfo->subpassCount);
+    skip |= CreatePassDAG(dev_data, pCreateInfo, subpass_to_node, has_self_dependency, subpass_to_dep_index);
+
     for (uint32_t i = 0; i < pCreateInfo->dependencyCount; ++i) {
         auto const &dependency = pCreateInfo->pDependencies[i];
         skip |= ValidateStageMaskGsTsEnables(dev_data, dependency.srcStageMask, "vkCreateRenderPass()", VALIDATION_ERROR_13e006b8,
@@ -9170,11 +9176,6 @@
     if (VK_SUCCESS == result) {
         lock.lock();
 
-        std::vector<bool> has_self_dependency(pCreateInfo->subpassCount);
-        std::vector<DAGNode> subpass_to_node(pCreateInfo->subpassCount);
-        std::vector<int32_t> subpass_to_dep_index(pCreateInfo->subpassCount);
-        skip |= CreatePassDAG(dev_data, pCreateInfo, subpass_to_node, has_self_dependency, subpass_to_dep_index);
-
         auto render_pass = std::make_shared<RENDER_PASS_STATE>(pCreateInfo);
         render_pass->renderPass = *pRenderPass;
         render_pass->hasSelfDependency = has_self_dependency;