diff options
Diffstat (limited to 'src/gpu/ccpr')
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCoverageOp.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCoverageProcessor.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/ccpr/GrCCPRCoverageProcessor.h | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/gpu/ccpr/GrCCPRCoverageOp.cpp b/src/gpu/ccpr/GrCCPRCoverageOp.cpp index a923726713..0903d4b32b 100644 --- a/src/gpu/ccpr/GrCCPRCoverageOp.cpp +++ b/src/gpu/ccpr/GrCCPRCoverageOp.cpp @@ -396,7 +396,9 @@ void GrCCPRCoverageOp::onExecute(GrOpFlushState* flushState) { // Triangles. auto constexpr kTrianglesGrPrimitiveType = GrCCPRCoverageProcessor::kTrianglesGrPrimitiveType; - this->drawMaskPrimitives(flushState, pipeline, Mode::kCombinedTriangleHullsAndEdges, + this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleHulls, + kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); + this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleEdges, kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); this->drawMaskPrimitives(flushState, pipeline, Mode::kTriangleCorners, kTrianglesGrPrimitiveType, 3, &PrimitiveTallies::fTriangles); diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp index 2d69c00188..a295f05d47 100644 --- a/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp +++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.cpp @@ -22,8 +22,6 @@ const char* GrCCPRCoverageProcessor::GetProcessorName(Mode mode) { return "GrCCPRTriangleHullAndEdgeProcessor (hulls)"; case Mode::kTriangleEdges: return "GrCCPRTriangleHullAndEdgeProcessor (edges)"; - case Mode::kCombinedTriangleHullsAndEdges: - return "GrCCPRTriangleHullAndEdgeProcessor (combined hulls & edges)"; case Mode::kTriangleCorners: return "GrCCPRTriangleCornerProcessor"; case Mode::kQuadraticHulls: @@ -68,8 +66,6 @@ GrGLSLPrimitiveProcessor* GrCCPRCoverageProcessor::createGLSLInstance(const GrSh return new GrCCPRTriangleHullAndEdgeProcessor(GeometryType::kHulls); case Mode::kTriangleEdges: return new GrCCPRTriangleHullAndEdgeProcessor(GeometryType::kEdges); - case Mode::kCombinedTriangleHullsAndEdges: - return new GrCCPRTriangleHullAndEdgeProcessor(GeometryType::kHullsAndEdges); case Mode::kTriangleCorners: return new GrCCPRTriangleCornerProcessor(); case Mode::kQuadraticHulls: diff --git a/src/gpu/ccpr/GrCCPRCoverageProcessor.h b/src/gpu/ccpr/GrCCPRCoverageProcessor.h index 8120136fad..879f724f4f 100644 --- a/src/gpu/ccpr/GrCCPRCoverageProcessor.h +++ b/src/gpu/ccpr/GrCCPRCoverageProcessor.h @@ -60,7 +60,6 @@ public: // Triangles. kTriangleHulls, kTriangleEdges, - kCombinedTriangleHullsAndEdges, kTriangleCorners, // Quadratics. |