commit 6eba3c6104f25fe39d55ff495e06e7178d2aed9f
author Shahbaz Youssefi <syoussefi@chromium.org> Thu Oct 11 14:00:08 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Oct 16 03:31:31 2018 +0000
tree 1a3f2a389aadcfae37fc525152f725124dca7324
parent a1ac3fe80647c3a4d6bdaaaff5aaeb2962e755fe

Vulkan: Distinguish query operations in GraphViz output

The query nodes now output BeginQuery or EndQuery based on the node's
function, instead of just Query.

Bug: angleproject:2379
Change-Id: I6ba38031c40b88e8927b31cdf14e4fdc2474624e
Reviewed-on: https://chromium-review.googlesource.com/c/1277485
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/CommandGraph.cpp

diff --git a/src/libANGLE/renderer/vulkan/CommandGraph.cpp b/src/libANGLE/renderer/vulkan/CommandGraph.cpp
index fa90703..6dfdefd 100644
--- a/src/libANGLE/renderer/vulkan/CommandGraph.cpp
+++ b/src/libANGLE/renderer/vulkan/CommandGraph.cpp
@@ -47,7 +47,8 @@
     return angle::Result::Continue();
 }
 
-const char *GetResourceTypeName(CommandGraphResourceType resourceType)
+const char *GetResourceTypeName(CommandGraphResourceType resourceType,
+                                CommandGraphNodeFunction function)
 {
     switch (resourceType)
     {
@@ -58,7 +59,16 @@
         case CommandGraphResourceType::Image:
             return "Image";
         case CommandGraphResourceType::Query:
-            return "Query";
+            switch (function)
+            {
+                case CommandGraphNodeFunction::BeginQuery:
+                    return "BeginQuery";
+                case CommandGraphNodeFunction::EndQuery:
+                    return "EndQuery";
+                default:
+                    UNREACHABLE();
+                    return "Query";
+            }
         default:
             UNREACHABLE();
             return "";
@@ -676,7 +686,7 @@
         int nodeID = nodeIDMap[node];
 
         std::stringstream strstr;
-        strstr << GetResourceTypeName(node->getResourceTypeForDiagnostics());
+        strstr << GetResourceTypeName(node->getResourceTypeForDiagnostics(), node->getFunction());
         strstr << " ";
 
         auto it = objectIDMap.find(node->getResourceIDForDiagnostics());