Vulkan: Command graph linearization (Step 3).

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -500,7 +500,11 @@ class ContextVk : public ContextImpl, public vk::Context, public vk::RenderPassO
     vk::Shared<vk::Fence> getLastSubmittedFence() const;
 
     // This should only be called from ResourceVk.
-    vk::CommandGraph *getCommandGraph() { return &mCommandGraph; }
+    vk::CommandGraph *getCommandGraph()
+    {
+        ASSERT(commandGraphEnabled());
+        return &mCommandGraph;
+    }
 
     vk::ShaderLibrary &getShaderLibrary() { return mShaderLibrary; }
     UtilsVk &getUtils() { return mUtils; }
@@ -571,13 +575,18 @@ class ContextVk : public ContextImpl, public vk::Context, public vk::RenderPassO
 
     RenderPassCommandBuffer &getRenderPassCommandBuffer()
     {
-        if (!mOutsideRenderPassCommands.empty())
-        {
-            mOutsideRenderPassCommands.flushToPrimary(&mPrimaryCommands);
-        }
+        mOutsideRenderPassCommands.flushToPrimary(&mPrimaryCommands);
         return mRenderPassCommands;
     }
 
+    angle::Result getPrimaryCommandBuffer(vk::PrimaryCommandBuffer **primaryCommands)
+    {
+        mOutsideRenderPassCommands.flushToPrimary(&mPrimaryCommands);
+        ANGLE_TRY(endRenderPass());
+        *primaryCommands = &mPrimaryCommands;
+        return angle::Result::Continue;
+    }
+
     egl::ContextPriority getContextPriority() const override { return mContextPriority; }
     angle::Result endRenderPass();
 

src/libANGLE/renderer/vulkan/QueryVk.cpp

@@ -67,11 +67,11 @@ angle::Result QueryVk::begin(const gl::Context *context)
                 contextVk, &mQueryHelperTimeElapsedBegin));
         }
 
-        mQueryHelperTimeElapsedBegin.writeTimestamp(contextVk);
+        ANGLE_TRY(mQueryHelperTimeElapsedBegin.writeTimestamp(contextVk));
     }
     else
     {
-        mQueryHelper.beginQuery(contextVk);
+        ANGLE_TRY(mQueryHelper.beginQuery(contextVk));
     }
 
     return angle::Result::Continue;
@@ -98,11 +98,11 @@ angle::Result QueryVk::end(const gl::Context *context)
     }
     else if (getType() == gl::QueryType::TimeElapsed)
     {
-        mQueryHelper.writeTimestamp(contextVk);
+        ANGLE_TRY(mQueryHelper.writeTimestamp(contextVk));
     }
     else
     {
-        mQueryHelper.endQuery(contextVk);
+        ANGLE_TRY(mQueryHelper.endQuery(contextVk));
     }
 
     return angle::Result::Continue;
@@ -121,9 +121,7 @@ angle::Result QueryVk::queryCounter(const gl::Context *context)
 
     ASSERT(getType() == gl::QueryType::Timestamp);
 
-    mQueryHelper.writeTimestamp(contextVk);
-
-    return angle::Result::Continue;
+    return mQueryHelper.writeTimestamp(contextVk);
 }
 
 angle::Result QueryVk::getResult(const gl::Context *context, bool wait)

src/libANGLE/renderer/vulkan/vk_caps_utils.cpp

@@ -108,19 +108,15 @@ void RendererVk::ensureCapsInitialized() const
     // We use secondary command buffers almost everywhere and they require a feature to be
     // able to execute in the presence of queries.  As a result, we won't support queries
     // unless that feature is available.
-    // TODO(jmadill): Enable without graph. http://anglebug.com/4029
     mNativeExtensions.occlusionQueryBoolean =
-        vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures) &&
-        mFeatures.commandGraph.enabled;
+        vk::CommandBuffer::SupportsQueries(mPhysicalDeviceFeatures);
 
     // From the Vulkan specs:
     // > The number of valid bits in a timestamp value is determined by the
     // > VkQueueFamilyProperties::timestampValidBits property of the queue on which the timestamp is
     // > written. Timestamps are supported on any queue which reports a non-zero value for
     // > timestampValidBits via vkGetPhysicalDeviceQueueFamilyProperties.
-    // TODO(jmadill): Enable without graph. http://anglebug.com/4029
-    mNativeExtensions.disjointTimerQuery =
-        queueFamilyProperties.timestampValidBits > 0 && mFeatures.commandGraph.enabled;
+    mNativeExtensions.disjointTimerQuery          = queueFamilyProperties.timestampValidBits > 0;
     mNativeExtensions.queryCounterBitsTimeElapsed = queueFamilyProperties.timestampValidBits;
     mNativeExtensions.queryCounterBitsTimestamp   = queueFamilyProperties.timestampValidBits;
 

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -1019,22 +1019,57 @@ void QueryHelper::deinit()
     mQuery            = 0;
 }
 
-void QueryHelper::beginQuery(ContextVk *contextVk)
+angle::Result QueryHelper::beginQuery(ContextVk *contextVk)
 {
-    contextVk->getCommandGraph()->beginQuery(getQueryPool(), getQuery());
+    if (contextVk->commandGraphEnabled())
+    {
+        contextVk->getCommandGraph()->beginQuery(getQueryPool(), getQuery());
+    }
+    else
+    {
+        vk::PrimaryCommandBuffer *primaryCommands;
+        ANGLE_TRY(contextVk->getPrimaryCommandBuffer(&primaryCommands));
+        VkQueryPool queryPool = getQueryPool()->getHandle();
+        primaryCommands->resetQueryPool(queryPool, mQuery, 1);
+        primaryCommands->beginQuery(queryPool, mQuery, 0);
+    }
     mMostRecentSerial = contextVk->getCurrentQueueSerial();
+    return angle::Result::Continue;
 }
 
-void QueryHelper::endQuery(ContextVk *contextVk)
+angle::Result QueryHelper::endQuery(ContextVk *contextVk)
 {
-    contextVk->getCommandGraph()->endQuery(getQueryPool(), getQuery());
+    if (contextVk->commandGraphEnabled())
+    {
+        contextVk->getCommandGraph()->endQuery(getQueryPool(), getQuery());
+    }
+    else
+    {
+        vk::PrimaryCommandBuffer *primaryCommands;
+        ANGLE_TRY(contextVk->getPrimaryCommandBuffer(&primaryCommands));
+        VkQueryPool queryPool = getQueryPool()->getHandle();
+        primaryCommands->endQuery(queryPool, mQuery);
+    }
     mMostRecentSerial = contextVk->getCurrentQueueSerial();
+    return angle::Result::Continue;
 }
 
-void QueryHelper::writeTimestamp(ContextVk *contextVk)
+angle::Result QueryHelper::writeTimestamp(ContextVk *contextVk)
 {
-    contextVk->getCommandGraph()->writeTimestamp(getQueryPool(), getQuery());
+    if (contextVk->commandGraphEnabled())
+    {
+        contextVk->getCommandGraph()->writeTimestamp(getQueryPool(), getQuery());
+    }
+    else
+    {
+        vk::PrimaryCommandBuffer *primaryCommands;
+        ANGLE_TRY(contextVk->getPrimaryCommandBuffer(&primaryCommands));
+        VkQueryPool queryPool = getQueryPool()->getHandle();
+        primaryCommands->resetQueryPool(queryPool, mQuery, 1);
+        primaryCommands->writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, queryPool, mQuery);
+    }
     mMostRecentSerial = contextVk->getCurrentQueueSerial();
+    return angle::Result::Continue;
 }
 
 bool QueryHelper::hasPendingWork(ContextVk *contextVk)

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -324,9 +324,9 @@ class QueryHelper final
     // Used only by DynamicQueryPool.
     size_t getQueryPoolIndex() const { return mQueryPoolIndex; }
 
-    void beginQuery(ContextVk *contextVk);
-    void endQuery(ContextVk *contextVk);
-    void writeTimestamp(ContextVk *contextVk);
+    angle::Result beginQuery(ContextVk *contextVk);
+    angle::Result endQuery(ContextVk *contextVk);
+    angle::Result writeTimestamp(ContextVk *contextVk);
 
     Serial getStoredQueueSerial() { return mMostRecentSerial; }
     bool hasPendingWork(ContextVk *contextVk);