Vulkan: Fix GraphViz dump in presence of queries and fences
A previous refactor made queries no longer a graph resource. This in
turn meant that the query nodes no longer had an ID, which tripped up
the ID assignment when dumping the graph.
This affected fences as well.
Bug: angleproject:2853
Change-Id: I359f8145dca068edaa5fcd5bcb0a231ee050ab76
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1520990
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/CommandGraph.h b/src/libANGLE/renderer/vulkan/CommandGraph.h
index adf1993..2bb90ff 100644
--- a/src/libANGLE/renderer/vulkan/CommandGraph.h
+++ b/src/libANGLE/renderer/vulkan/CommandGraph.h
@@ -134,6 +134,8 @@
CommandGraphNodeFunction getFunction() const { return mFunction; }
void setQueryPool(const QueryPool *queryPool, uint32_t queryIndex);
+ VkQueryPool getQueryPool() const { return mQueryPool; }
+ uint32_t getQueryIndex() const { return mQueryIndex; }
void setFenceSync(const vk::Event &event);
void setDebugMarker(GLenum source, std::string &&marker);
const std::string &getDebugMarker() const { return mDebugMarker; }
@@ -384,8 +386,9 @@
void popDebugMarker();
private:
- CommandGraphNode *allocateBarrierNode(CommandGraphResourceType resourceType,
- CommandGraphNodeFunction function);
+ CommandGraphNode *allocateBarrierNode(CommandGraphNodeFunction function,
+ CommandGraphResourceType resourceType,
+ uintptr_t resourceID);
void setNewBarrier(CommandGraphNode *newBarrier);
CommandGraphNode *getLastBarrierNode(size_t *indexOut);
void addDependenciesToNextBarrier(size_t begin, size_t end, CommandGraphNode *nextBarrier);