Vulkan: Fix CommandGraph barrier nodes w.r.t to first node

The barrier dependencies were set in two loops: - From Previous to (Previous, Current] - From (Previous, Current) to Current The "Previous to Current" dependency was set in the first loop. This loop is conditioned to a previous barrier existing at all. The bug is that for the first barrier node, the first loop does not execute and the second loop does not create the dependency from the first node (Previous index being 0 when no previous barrier exists) to the barrier node. Bug: angleproject:2361 Change-Id: I61a78dbbeba6cf97788bf8ea32908c7865ad48c2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1520994 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Vulkan: Fix CommandGraph barrier nodes w.r.t to first node
2fb6563b · Shahbaz Youssefi · Commit Bot · d84728e0 · 2fb6563b
Commit 2fb6563b authored Mar 13, 2019 by Shahbaz Youssefi Committed by Commit Bot Mar 14, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

CommandGraph.cpp src/libANGLE/renderer/vulkan/CommandGraph.cpp +4 -4

No files found.
--- a/src/libANGLE/renderer/vulkan/CommandGraph.cpp
+++ b/src/libANGLE/renderer/vulkan/CommandGraph.cpp
@@ -632,16 +632,16 @@ void CommandGraph::setNewBarrier(CommandGraphNode *newBarrier)
    size_t previousBarrierIndex       = 0;
    CommandGraphNode *previousBarrier = getLastBarrierNode(&previousBarrierIndex);

-    // Add a dependency from previousBarrier to all nodes in (previousBarrier, newBarrier].
+    // Add a dependency from previousBarrier to all nodes in (previousBarrier, newBarrier).
    if (previousBarrier && previousBarrierIndex + 1 < mNodes.size())
    {
-        size_t afterNodesCount = mNodes.size() - (previousBarrierIndex + 1);
+        size_t afterNodesCount = mNodes.size() - (previousBarrierIndex + 2);
        CommandGraphNode::SetHappensBeforeDependencies(
            previousBarrier, &mNodes[previousBarrierIndex + 1], afterNodesCount);
    }

-    // Add a dependency from all nodes in (previousBarrier, newBarrier) to newBarrier.
-    addDependenciesToNextBarrier(previousBarrierIndex + 1, mNodes.size() - 1, newBarrier);
+    // Add a dependency from all nodes in [previousBarrier, newBarrier) to newBarrier.
+    addDependenciesToNextBarrier(previousBarrierIndex, mNodes.size() - 1, newBarrier);

    mLastBarrierIndex = mNodes.size() - 1;
 }