Flush GrContext between benchmark draw loops

This change updates a small subset of benchmarks to flush the GrContext
between draw loops (specifically SKP benchmarks, SampleApp, and the
warmup in visualbench). This helps improve timing accuracy by not
allowing the gpu to batch across draw boundaries in the affected
benchmarks.

BUG=skia:

Review URL: https://codereview.chromium.org/1427533002

1 files changed, 10 insertions, 0 deletions

diff --git a/tools/VisualBench/VisualSKPBench.cpp b/tools/VisualBench/VisualSKPBench.cpp
index 649d324a66..628265e53e 100644
--- a/tools/VisualBench/VisualSKPBench.cpp
+++ b/tools/VisualBench/VisualSKPBench.cpp
@@ -8,6 +8,10 @@
 
 #include "VisualSKPBench.h"
 
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#endif
+
 VisualSKPBench::VisualSKPBench(const char* name, const SkPicture* pic)
     : fPic(SkRef(pic))
     , fName(name) {
@@ -29,5 +33,11 @@ bool VisualSKPBench::isSuitableFor(Backend backend) {
 void VisualSKPBench::onDraw(int loops, SkCanvas* canvas) {
     for (int i = 0; i < loops; i++) {
         canvas->drawPicture(fPic);
+#if SK_SUPPORT_GPU
+        // Ensure the GrContext doesn't batch across draw loops.
+        if (GrContext* context = canvas->getGrContext()) {
+            context->flush();
+        }
+#endif
     }
 }