move vertex-mode enum into SkVertices

BUG=skia:6366

Change-Id: I3c0bf96cce6d32c9b8d12d16a772aaa6f18981aa
Reviewed-on: https://skia-review.googlesource.com/11062
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>

2 files changed, 10 insertions, 6 deletions

diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index 681b823f09..bd7d11465d 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp
@@ -11,6 +11,7 @@
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
+#include "SkVertices.h"
 
 // This bench simulates the calls Skia sees from various HTML5 canvas
 // game bench marks
@@ -200,8 +201,9 @@ protected:
                         { SkIntToScalar(src.fRight), SkIntToScalar(src.fTop) },
                         { SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) },
                     };
-                    canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
-                                         4, verts, uvs, nullptr, indices, 6, p2);
+                    canvas->drawVertices(SkVertices::MakeCopy(SkVertices::kTriangles_VertexMode,
+                                                              4, verts, uvs, nullptr, 6, indices),
+                                         SkBlendMode::kModulate, p2);
                 } else {
                     canvas->drawBitmapRect(fAtlas, src, dst, &p,
                                            SkCanvas::kFast_SrcRectConstraint);
diff --git a/bench/VertBench.cpp b/bench/VertBench.cpp
index 0744f948ba..6e1613b9ff 100644
--- a/bench/VertBench.cpp
+++ b/bench/VertBench.cpp
@@ -11,6 +11,7 @@
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
+#include "SkVertices.h"
 
 enum VertFlags {
     kColors_VertFlag,
@@ -76,14 +77,15 @@ public:
     }
 
 protected:
-    virtual const char* onGetName() { return fName.c_str(); }
-    virtual void onDraw(int loops, SkCanvas* canvas) {
+    const char* onGetName() override { return fName.c_str(); }
+    void onDraw(int loops, SkCanvas* canvas) override {
         SkPaint paint;
         this->setupPaint(&paint);
 
+        auto verts = SkVertices::MakeCopy(SkVertices::kTriangles_VertexMode, PTS,
+                                          fPts, nullptr, fColors, IDX, fIdx);
         for (int i = 0; i < loops; i++) {
-            canvas->drawVertices(SkCanvas::kTriangles_VertexMode, PTS,
-                                 fPts, nullptr, fColors, fIdx, IDX, paint);
+            canvas->drawVertices(verts, SkBlendMode::kModulate, paint);
         }
     }
 private: