Clean up overlay RenderPass count reporting.

src/libANGLE/OverlayWidgets.h

@@ -136,17 +136,33 @@ class RunningGraph : public Widget
     // Out of line constructor to satisfy chromium-style.
     RunningGraph(size_t n);
     ~RunningGraph() override;
-    void add(size_t n) { runningValues[lastValueIndex] += n; }
+
+    void add(size_t n)
+    {
+        if (!ignoreFirstValue)
+        {
+            runningValues[lastValueIndex] += n;
+        }
+    }
+
     void next()
     {
-        lastValueIndex                = (lastValueIndex + 1) % runningValues.size();
-        runningValues[lastValueIndex] = 0;
+        if (ignoreFirstValue)
+        {
+            ignoreFirstValue = false;
+        }
+        else
+        {
+            lastValueIndex                = (lastValueIndex + 1) % runningValues.size();
+            runningValues[lastValueIndex] = 0;
+        }
     }
 
   protected:
     std::vector<size_t> runningValues;
     size_t lastValueIndex = 0;
     Text description;
+    bool ignoreFirstValue = true;
 
     friend class gl::Overlay;
     friend class gl::OverlayState;

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -1543,15 +1543,18 @@ angle::Result ContextVk::handleDirtyDescriptorSets(const gl::Context *context,
     return angle::Result::Continue;
 }
 
-angle::Result ContextVk::submitFrame(const VkSubmitInfo &submitInfo,
-                                     vk::PrimaryCommandBuffer &&commandBuffer)
+void ContextVk::updateOverlayOnPresent()
 {
     // Update overlay if active.
     gl::RunningGraphWidget *renderPassCount =
         mState.getOverlay()->getRunningGraphWidget(gl::WidgetId::VulkanRenderPassCount);
     renderPassCount->add(mRenderPassCommands->getAndResetCounter());
     renderPassCount->next();
+}
 
+angle::Result ContextVk::submitFrame(const VkSubmitInfo &submitInfo,
+                                     vk::PrimaryCommandBuffer &&commandBuffer)
+{
     if (vk::CommandBufferHelper::kEnableCommandStreamDiagnostics)
     {
         dumpCommandStreamDiagnostics();

src/libANGLE/renderer/vulkan/ContextVk.h

@@ -524,6 +524,8 @@ class ContextVk : public ContextImpl, public vk::Context
     void beginOcclusionQuery(QueryVk *queryVk);
     void endOcclusionQuery(QueryVk *queryVk);
 
+    void updateOverlayOnPresent();
+
   private:
     // Dirty bits.
     enum DirtyBitType : size_t

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -1631,6 +1631,8 @@ void WindowSurfaceVk::updateOverlay(ContextVk *contextVk) const
         overlay->getCountWidget(gl::WidgetId::VulkanValidationMessageCount)
             ->add(validationMessageCount);
     }
+
+    contextVk->updateOverlayOnPresent();
 }
 
 ANGLE_INLINE bool WindowSurfaceVk::overlayHasEnabledWidget(ContextVk *contextVk) const

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -409,7 +409,8 @@ ANGLERenderTest::ANGLERenderTest(const std::string &name, const RenderTestParams
       mTestParams(testParams),
       mIsTimestampQueryAvailable(false),
       mGLWindow(nullptr),
-      mOSWindow(nullptr)
+      mOSWindow(nullptr),
+      mSwapEnabled(true)
 {
     // Force fast tests to make sure our slowest bots don't time out.
     if (OneFrame())
@@ -676,7 +677,10 @@ void ANGLERenderTest::step()
         // internal command queue to the GPU. This is enabled for null back-end
         // devices because some back-ends (e.g. Vulkan) also accumulate internal
         // command queues.
-        mGLWindow->swap();
+        if (mSwapEnabled)
+        {
+            mGLWindow->swap();
+        }
         mOSWindow->messageLoop();
 
 #if defined(ANGLE_ENABLE_ASSERTS)

src/tests/perf_tests/ANGLEPerfTest.h

@@ -155,6 +155,8 @@ class ANGLERenderTest : public ANGLEPerfTest
     void beginGLTraceEvent(const char *name, double hostTimeSec);
     void endGLTraceEvent(const char *name, double hostTimeSec);
 
+    void disableTestHarnessSwap() { mSwapEnabled = false; }
+
     bool mIsTimestampQueryAvailable;
 
   private:
@@ -172,6 +174,7 @@ class ANGLERenderTest : public ANGLEPerfTest
     std::vector<const char *> mExtensionPrerequisites;
     angle::PlatformMethods mPlatformMethods;
     ConfigParameters mConfigParams;
+    bool mSwapEnabled;
 
     GLuint mTimestampQuery;
 

src/tests/perf_tests/TracePerfTest.cpp

@@ -111,6 +111,9 @@ TracePerfTest::TracePerfTest()
     {
         mSkipTest = true;
     }
+
+    // We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
+    disableTestHarnessSwap();
 }
 
 void TracePerfTest::initializeBenchmark()
@@ -138,6 +141,7 @@ void TracePerfTest::initializeBenchmark()
 
     // Potentially slow. Can load a lot of resources.
     SetupReplay(params.testID);
+    glFinish();
 
     ASSERT_TRUE(mEndFrame > mStartFrame);