commit 3809bab7ed344ad140346c38e149dabf10bd525f
author Chris Dalton <csmartdalton@google.com> Tue Jun 13 10:55:06 2017 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 13 18:18:23 2017 +0000
tree 4bd274cb01c35b8f996bbb113df5cf684d6b48a7
parent f1debdf2b065cd3ec5f4501d84152366442719c4

Add GrPrimitiveType::kLinesAdjacency

Converts GrPrimitiveType to an enum class and adds kLinesAdjacency.

Bug: skia:
Change-Id: I3b5e68acfb20476f6c6923968f5a4ac4f73ae12d
Reviewed-on: https://skia-review.googlesource.com/19680
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

tests/GrMeshTest.cpp

diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index dd2a2d9..0811982 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -147,7 +147,7 @@
         auto vbuff = helper->makeVertexBuffer(expandedVertexData);
         VALIDATE(vbuff);
         for (int y = 0; y < kBoxCountY; ++y) {
-            GrMesh mesh(kTriangles_GrPrimitiveType);
+            GrMesh mesh(GrPrimitiveType::kTriangles);
             mesh.setNonIndexedNonInstanced(kBoxCountX * 6);
             mesh.setVertexData(vbuff.get(), y * kBoxCountX * 6);
             helper->drawMesh(mesh);
@@ -167,7 +167,7 @@
             GR_STATIC_ASSERT(kIndexPatternRepeatCount >= 3);
             int repetitionCount = SkTMin(3 - baseRepetition, kBoxCount - i);
 
-            GrMesh mesh(kTriangles_GrPrimitiveType);
+            GrMesh mesh(GrPrimitiveType::kTriangles);
             mesh.setIndexed(ibuff.get(), repetitionCount * 6, baseRepetition * 6,
                             baseRepetition * 4, (baseRepetition + repetitionCount) * 4 - 1);
             mesh.setVertexData(vbuff.get(), (i - baseRepetition) * 4);
@@ -187,7 +187,7 @@
         // Draw boxes one line at a time to exercise base vertex. setIndexedPatterned does not
         // support a base index.
         for (int y = 0; y < kBoxCountY; ++y) {
-            GrMesh mesh(kTriangles_GrPrimitiveType);
+            GrMesh mesh(GrPrimitiveType::kTriangles);
             mesh.setIndexedPatterned(ibuff.get(), 6, 4, kBoxCountX, kIndexPatternRepeatCount);
             mesh.setVertexData(vbuff.get(), y * kBoxCountX * 4);
             helper->drawMesh(mesh);
@@ -213,7 +213,8 @@
             // Draw boxes one line at a time to exercise base instance, base vertex, and null vertex
             // buffer. setIndexedInstanced intentionally does not support a base index.
             for (int y = 0; y < kBoxCountY; ++y) {
-                GrMesh mesh(indexed ? kTriangles_GrPrimitiveType : kTriangleStrip_GrPrimitiveType);
+                GrMesh mesh(indexed ? GrPrimitiveType::kTriangles
+                                    : GrPrimitiveType::kTriangleStrip);
                 if (indexed) {
                     VALIDATE(idxbuff);
                     mesh.setIndexedInstanced(idxbuff.get(), 6,