diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-06-12 20:44:08 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 14:25:21 +0000 |
| commit | f7eb015083aba8942031145736251dd32094115d (patch) | |
| tree | 97ed397a5e8189b8c3600842c9be1ce1d46ab5ba /tests | |
| parent | e93cf97175d348ce1400762bdd8d9acabdd29766 (diff) | |
Add GrPrimitiveType::kLinesAdjacency
Converts GrPrimitiveType to an enum class and adds kLinesAdjacency.
Bug: skia:
Change-Id: If57d26277182aac1375e8181211ddaf7ea6d1e0a
Reviewed-on: https://skia-review.googlesource.com/19581
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrMeshTest.cpp | 9 | ||||
| -rw-r--r-- | tests/GrPipelineDynamicStateTest.cpp | 2 | ||||
| -rw-r--r-- | tests/OnFlushCallbackTest.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp index dd2a2d9e33..0811982a54 100644 --- a/tests/GrMeshTest.cpp +++ b/tests/GrMeshTest.cpp @@ -147,7 +147,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) { 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 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) { 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 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) { // 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 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrMeshTest, reporter, ctxInfo) { // 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, diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp index 4c5843aeb1..f3dd27316d 100644 --- a/tests/GrPipelineDynamicStateTest.cpp +++ b/tests/GrPipelineDynamicStateTest.cpp @@ -126,7 +126,7 @@ private: GrPipeline pipeline(rt, fScissorState, SkBlendMode::kSrc); SkSTArray<kNumMeshes, GrMesh> meshes; for (int i = 0; i < kNumMeshes; ++i) { - GrMesh& mesh = meshes.emplace_back(kTriangleStrip_GrPrimitiveType); + GrMesh& mesh = meshes.emplace_back(GrPrimitiveType::kTriangleStrip); mesh.setNonIndexedNonInstanced(4); mesh.setVertexData(fVertexBuffer.get(), 4 * i); } diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp index f8026e816a..f8198687cb 100644 --- a/tests/OnFlushCallbackTest.cpp +++ b/tests/OnFlushCallbackTest.cpp @@ -144,7 +144,7 @@ private: } } - GrMesh mesh(kTriangles_GrPrimitiveType); + GrMesh mesh(GrPrimitiveType::kTriangles); mesh.setIndexed(indexBuffer, 6, firstIndex, 0, 3); mesh.setVertexData(vertexBuffer, firstVertex); |