Vulkan: Remove command graph size overlay widget.

scripts/code_generation_hashes/overlay_widgets.json

 {
   "src/libANGLE/Overlay_autogen.cpp":
-    "1c882462aacb436dbd88d6e7fdbe4473",
+    "b0d9803f2db7b962a53d4d8857a63fbc",
   "src/libANGLE/gen_overlay_widgets.py":
     "07252fbde304fd48559ae07f8f920a08",
   "src/libANGLE/overlay_widgets.json":
-    "c84d5c85c6bd21d30056ad2fb9213e38"
+    "13629734c314cc88c485cb27527913f3"
 }
\ No newline at end of file

src/libANGLE/Overlay.cpp

@@ -26,7 +26,6 @@ constexpr std::pair<const char *, WidgetId> kWidgetNames[] = {
     {"FPS", WidgetId::FPS},
     {"VulkanLastValidationMessage", WidgetId::VulkanLastValidationMessage},
     {"VulkanValidationMessageCount", WidgetId::VulkanValidationMessageCount},
-    {"VulkanCommandGraphSize", WidgetId::VulkanCommandGraphSize},
     {"VulkanRenderPassCount", WidgetId::VulkanRenderPassCount},
     {"VulkanSecondaryCommandBufferPoolWaste", WidgetId::VulkanSecondaryCommandBufferPoolWaste},
 };

src/libANGLE/OverlayWidgets.cpp

@@ -423,8 +423,6 @@ constexpr angle::PackedEnumMap<WidgetId, AppendWidgetDataFunc> kWidgetIdToAppend
      overlay_impl::AppendWidgetDataHelper::AppendVulkanLastValidationMessage},
     {WidgetId::VulkanValidationMessageCount,
      overlay_impl::AppendWidgetDataHelper::AppendVulkanValidationMessageCount},
-    {WidgetId::VulkanCommandGraphSize,
-     overlay_impl::AppendWidgetDataHelper::AppendVulkanCommandGraphSize},
     {WidgetId::VulkanRenderPassCount,
      overlay_impl::AppendWidgetDataHelper::AppendVulkanRenderPassCount},
     {WidgetId::VulkanSecondaryCommandBufferPoolWaste,

src/libANGLE/OverlayWidgets.h

@@ -57,8 +57,6 @@ enum class WidgetId
     VulkanLastValidationMessage,
     // Number of validation errors and warnings (Count).
     VulkanValidationMessageCount,
-    // Number of nodes in command graph (RunningGraph).
-    VulkanCommandGraphSize,
     // Number of RenderPasses in a frame (RunningGraph).
     VulkanRenderPassCount,
     // Secondary Command Buffer pool memory waste (RunningHistogram).

src/libANGLE/Overlay_autogen.cpp

@@ -123,49 +123,6 @@ void Overlay::initOverlayWidgets()
             widget->color[2]  = 0.0;
             widget->color[3]  = 0.78431372549;
         }
-        mState.mOverlayWidgets[WidgetId::VulkanCommandGraphSize].reset(widget);
-        {
-            const int32_t fontSize = GetFontSize(kFontLayerSmall, kLargeFont);
-            const int32_t offsetX =
-                mState.mOverlayWidgets[WidgetId::VulkanCommandGraphSize]->coords[0];
-            const int32_t offsetY =
-                mState.mOverlayWidgets[WidgetId::VulkanCommandGraphSize]->coords[1];
-            const int32_t width  = 40 * kFontGlyphWidths[fontSize];
-            const int32_t height = kFontGlyphHeights[fontSize];
-
-            widget->description.type      = WidgetType::Text;
-            widget->description.fontSize  = fontSize;
-            widget->description.coords[0] = offsetX;
-            widget->description.coords[1] = std::max(offsetY - height, 1);
-            widget->description.coords[2] = offsetX + width;
-            widget->description.coords[3] = offsetY;
-            widget->description.color[0]  = 0.294117647059;
-            widget->description.color[1]  = 0.78431372549;
-            widget->description.color[2]  = 0.0;
-            widget->description.color[3]  = 1.0;
-        }
-    }
-
-    {
-        RunningGraph *widget = new RunningGraph(60);
-        {
-            const int32_t fontSize = GetFontSize(0, kLargeFont);
-            const int32_t offsetX  = 10;
-            const int32_t offsetY  = 100;
-            const int32_t width    = 5 * static_cast<uint32_t>(widget->runningValues.size());
-            const int32_t height   = 100;
-
-            widget->type      = WidgetType::RunningGraph;
-            widget->fontSize  = fontSize;
-            widget->coords[0] = offsetX;
-            widget->coords[1] = offsetY;
-            widget->coords[2] = offsetX + width;
-            widget->coords[3] = offsetY + height;
-            widget->color[0]  = 0.294117647059;
-            widget->color[1]  = 0.78431372549;
-            widget->color[2]  = 0.0;
-            widget->color[3]  = 0.78431372549;
-        }
         mState.mOverlayWidgets[WidgetId::VulkanRenderPassCount].reset(widget);
         {
             const int32_t fontSize = GetFontSize(kFontLayerSmall, kLargeFont);

src/libANGLE/overlay_widgets.json

@@ -53,20 +53,6 @@
             "length": 25
         },
         {
-            "name": "VulkanCommandGraphSize",
-            "type": "RunningGraph(60)",
-            "color": [75, 200, 0, 200],
-            "coords": [10, 100],
-            "bar_width": 5,
-            "height": 100,
-            "description": {
-                "color": [75, 200, 0, 255],
-                "coords": ["VulkanCommandGraphSize.left.align", "VulkanCommandGraphSize.top.adjacent"],
-                "font": "small",
-                "length": 40
-            }
-        },
-        {
             "name": "VulkanRenderPassCount",
             "type": "RunningGraph(60)",
             "color": [75, 200, 0, 200],

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -179,6 +179,8 @@ angle::Result FramebufferVk::invalidateSub(const gl::Context *context,
     if (mFramebuffer != nullptr)
     {
         ASSERT(mFramebuffer->valid());
+        mFramebuffer->onResourceAccess(&contextVk->getResourceUseList());
+
         if (contextVk->hasStartedRenderPass() &&
             area.encloses(contextVk->getStartedRenderPassCommands().getRenderArea()))
         {

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -1487,9 +1487,6 @@ angle::Result WindowSurfaceVk::updateAndDrawOverlay(ContextVk *contextVk,
         image->imageViews.getLevelLayerDrawImageView(contextVk, image->image, 0, 0, &imageView));
     ANGLE_TRY(overlayVk->onPresent(contextVk, &image->image, imageView));
 
-    // TODO(jmadill): Remove this. http://anglebug.com/4029
-    overlay->getRunningGraphWidget(gl::WidgetId::VulkanCommandGraphSize)->next();
-
     return angle::Result::Continue;
 }