diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-06-13 10:55:06 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 18:18:23 +0000 |
| commit | 3809bab7ed344ad140346c38e149dabf10bd525f (patch) | |
| tree | 4bd274cb01c35b8f996bbb113df5cf684d6b48a7 /src/gpu/ops/GrDrawVerticesOp.h | |
| parent | f1debdf2b065cd3ec5f4501d84152366442719c4 (diff) | |
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>
Diffstat (limited to 'src/gpu/ops/GrDrawVerticesOp.h')
| -rw-r--r-- | src/gpu/ops/GrDrawVerticesOp.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h index 1d788ab15c..4ff19cc4c2 100644 --- a/src/gpu/ops/GrDrawVerticesOp.h +++ b/src/gpu/ops/GrDrawVerticesOp.h @@ -45,8 +45,8 @@ public: SkString dumpInfo() const override { SkString string; - string.appendf("PrimType: %d, MeshCount %d, VCount: %d, ICount: %d\n", fPrimitiveType, - fMeshes.count(), fVertexCount, fIndexCount); + string.appendf("PrimType: %d, MeshCount %d, VCount: %d, ICount: %d\n", + (int) fPrimitiveType, fMeshes.count(), fVertexCount, fIndexCount); string.append(DumpPipelineInfo(*this->pipeline())); string.append(INHERITED::dumpInfo()); return string; @@ -70,9 +70,9 @@ private: GrPrimitiveType primitiveType() const { return fPrimitiveType; } bool combinablePrimitive() const { - return kTriangles_GrPrimitiveType == fPrimitiveType || - kLines_GrPrimitiveType == fPrimitiveType || - kPoints_GrPrimitiveType == fPrimitiveType; + return GrPrimitiveType::kTriangles == fPrimitiveType || + GrPrimitiveType::kLines == fPrimitiveType || + GrPrimitiveType::kPoints == fPrimitiveType; } bool onCombineIfPossible(GrOp* t, const GrCaps&) override; |