DrawPoints fixes/tweaks

Author: George Wright

flow/display_list_benchmarks.cc

@@ -552,27 +552,36 @@ std::vector<SkPoint> GetTestPoints(size_t count, SkISize canvasSize) {
   std::vector<SkPoint> points;
 
   // Some arbitrary offsets to use when building the list of points
-  std::vector<SkScalar> deltaXs = { 10.0f, 6.3f, 15.0f, 3.5f, 22.6f, 4.7f };
-  std::vector<SkScalar> deltaYs = { 9.3f, -5.4f, 8.5f, -12.0f, 19.2f, -19.6f };
+  std::vector<SkScalar> deltaX = {10.0f, 6.3f, 15.0f, 3.5f, 22.6f, 4.7f};
+  std::vector<SkScalar> deltaY = {9.3f, -5.4f, 8.5f, -12.0f, 19.2f, -19.6f};
 
   SkPoint current = SkPoint::Make(0.0f, 0.0f);
-  SkScalar deltaX, deltaY;
   for (size_t i = 0; i < count; i++) {
     points.push_back(current);
-    deltaX = deltaXs[i % deltaXs.size()];
-    deltaY = deltaYs[i % deltaYs.size()];
-    if (current.x() + deltaX > canvasSize.width()) {
-      current.offset(-canvasSize.width() + deltaX, 25.0f + deltaY);
-    } else if (current.y() + deltaY > canvasSize.height()) {
-      current = SkPoint::Make(deltaX, deltaY);
-    } else {
-      current.offset(deltaX, deltaY);
+    current.offset(deltaX[i % deltaX.size()], deltaY[i % deltaY.size()]);
+    if (current.x() > canvasSize.width()) {
+      current.offset(-canvasSize.width(), 25.0f);
+    }
+    if (current.y() > canvasSize.height()) {
+      current.offset(0.0f, -canvasSize.height());
     }
   }
 
   return points;
 }
 
+std::string PointModeToString(SkCanvas::PointMode mode) {
+  switch (mode) {
+    case SkCanvas::kLines_PointMode:
+      return "Points";
+    case SkCanvas::kPolygon_PointMode:
+      return "Polygon";
+    case SkCanvas::kPoints_PointMode:
+    default:
+      return "Points";
+  }
+}
+
 void BM_DrawPoints(benchmark::State& state,
                    std::unique_ptr<CanvasProvider> canvas_provider,
                    SkCanvas::PointMode mode) {
@@ -582,17 +591,22 @@ void BM_DrawPoints(benchmark::State& state,
   auto canvas = canvas_provider->GetSurface()->getCanvas();
   builder.setStrokeWidth(5.0f);
 
-  std::vector<SkPoint> points = GetTestPoints(100000, SkISize::Make(1024, 1024));
-  builder.drawPoints(SkCanvas::kPoints_PointMode, points.size(), points.data());
+  size_t pointCount = state.range(0);
+  state.SetComplexityN(pointCount);
+  state.counters["PointCount"] = pointCount;
+  std::vector<SkPoint> points =
+      GetTestPoints(pointCount, SkISize::Make(1024, 1024));
+  builder.drawPoints(mode, points.size(), points.data());
 
   auto displaylist = builder.Build();
 
   for (auto _ : state) {
     displaylist->RenderTo(canvas);
     canvas_provider->GetSurface()->flushAndSubmit(true);
   }
-  
+
   auto filename = canvas_provider->BackendName() + "-DrawPoints-" +
+                  PointModeToString(mode) + "-" + std::to_string(pointCount) +
                   ".png";
   canvas_provider->Snapshot(filename);
 }
@@ -635,11 +649,27 @@ BENCHMARK_CAPTURE(BM_DrawArc,
     ->Unit(benchmark::kMillisecond);
 
 BENCHMARK_CAPTURE(BM_DrawPoints,
-                  Software,
+                  Points/Software,
                   std::make_unique<SoftwareCanvasProvider>(),
                   SkCanvas::kPoints_PointMode)
     ->RangeMultiplier(2)
-    ->Range(128, 2048)
+    ->Range(1024, 32768)
+    ->Unit(benchmark::kMillisecond);
+
+BENCHMARK_CAPTURE(BM_DrawPoints,
+                  Lines/Software,
+                  std::make_unique<SoftwareCanvasProvider>(),
+                  SkCanvas::kLines_PointMode)
+    ->RangeMultiplier(2)
+    ->Range(1024, 32768)
+    ->Unit(benchmark::kMillisecond);
+
+BENCHMARK_CAPTURE(BM_DrawPoints,
+                  Polygon/Software,
+                  std::make_unique<SoftwareCanvasProvider>(),
+                  SkCanvas::kPolygon_PointMode)
+    ->RangeMultiplier(2)
+    ->Range(1024, 32768)
     ->Unit(benchmark::kMillisecond);
 
 BENCHMARK_CAPTURE(BM_DrawRRect,

flow/display_list_benchmarks.h

@@ -9,6 +9,7 @@
 #include "flutter/fml/mapping.h"
 #include "flutter/testing/testing.h"
 
+#include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/core/SkVertices.h"
@@ -61,6 +62,9 @@ void BM_DrawRRect(benchmark::State& state,
 void BM_DrawPath(benchmark::State& state,
                  std::unique_ptr<CanvasProvider> canvas_provider,
                  SkPath::Verb type);
+void BM_DrawPoints(benchmark::State& state,
+                   std::unique_ptr<CanvasProvider> canvas_provider,
+                   SkCanvas::PointMode mode);
 void BM_DrawVertices(benchmark::State& state,
                      std::unique_ptr<CanvasProvider> canvas_provider,
                      SkVertices::VertexMode mode);

flow/display_list_benchmarks_gl.cc

@@ -66,6 +66,30 @@ BENCHMARK_CAPTURE(BM_DrawCircle, OpenGL, std::make_unique<OpenGLCanvasProvider>(
     ->UseRealTime()
     ->Unit(benchmark::kMillisecond);
 
+BENCHMARK_CAPTURE(BM_DrawPoints,
+                  Points/OpenGL,
+                  std::make_unique<OpenGLCanvasProvider>(),
+                  SkCanvas::kPoints_PointMode)
+    ->RangeMultiplier(2)
+    ->Range(1024, 32768)
+    ->Unit(benchmark::kMillisecond);
+
+BENCHMARK_CAPTURE(BM_DrawPoints,
+                  Lines/OpenGL,
+                  std::make_unique<OpenGLCanvasProvider>(),
+                  SkCanvas::kLines_PointMode)
+    ->RangeMultiplier(2)
+    ->Range(1024, 32768)
+    ->Unit(benchmark::kMillisecond);
+
+BENCHMARK_CAPTURE(BM_DrawPoints,
+                  Polygon/OpenGL,
+                  std::make_unique<OpenGLCanvasProvider>(),
+                  SkCanvas::kPolygon_PointMode)
+    ->RangeMultiplier(2)
+    ->Range(1024, 32768)
+    ->Unit(benchmark::kMillisecond);
+
 BENCHMARK_CAPTURE(BM_DrawRRect,
                   Symmetric/OpenGL,
                   std::make_unique<OpenGLCanvasProvider>(),