Revert "Revert "Revert "Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs."""
This reverts commit b4e965c103c3140f0072949343befb34bceadc96.
Reason for revert: Thin stroke problems, chrome pixel test, g3 clang-tidy
Original change's description:
> Revert "Revert "Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs.""
>
> This reverts commit befff6580e9dc6b15bc6db3cc3f5fff22185cba8.
>
> Bug: skia:
> Change-Id: Ia108408cd986c03783af5058845790f6b17201f4
> Reviewed-on: https://skia-review.googlesource.com/98703
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com
Change-Id: I785af7efdfc39680052f5721a55ecffbeaf1f0ad
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/98785
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/ops/GrOvalOpFactory.h b/src/gpu/ops/GrOvalOpFactory.h
index d31e09e..1bdf3ee 100644
--- a/src/gpu/ops/GrOvalOpFactory.h
+++ b/src/gpu/ops/GrOvalOpFactory.h
@@ -22,33 +22,29 @@
/*
* This namespace wraps helper functions that draw ovals, rrects, and arcs (filled & stroked)
- * The ops always use coverage even when their non-AA.
*/
class GrOvalOpFactory {
public:
- static std::unique_ptr<GrDrawOp> MakeCoverageOvalOp(GrPaint&&,
- GrAA,
- const SkMatrix&,
- const SkRect& oval,
- const SkStrokeRec&,
- const GrShaderCaps*);
+ static std::unique_ptr<GrDrawOp> MakeOvalOp(GrPaint&&,
+ const SkMatrix&,
+ const SkRect& oval,
+ const SkStrokeRec&,
+ const GrShaderCaps*);
- static std::unique_ptr<GrDrawOp> MakeCoverageRRectOp(GrPaint&&,
- GrAA,
- const SkMatrix&,
- const SkRRect&,
- const SkStrokeRec&,
- const GrShaderCaps*);
+ static std::unique_ptr<GrDrawOp> MakeRRectOp(GrPaint&&,
+ const SkMatrix&,
+ const SkRRect&,
+ const SkStrokeRec&,
+ const GrShaderCaps*);
- static std::unique_ptr<GrDrawOp> MakeCoverageArcOp(GrPaint&&,
- GrAA,
- const SkMatrix&,
- const SkRect& oval,
- SkScalar startAngle,
- SkScalar sweepAngle,
- bool useCenter,
- const GrStyle&,
- const GrShaderCaps*);
+ static std::unique_ptr<GrDrawOp> MakeArcOp(GrPaint&&,
+ const SkMatrix&,
+ const SkRect& oval,
+ SkScalar startAngle,
+ SkScalar sweepAngle,
+ bool useCenter,
+ const GrStyle&,
+ const GrShaderCaps*);
};
#endif // GrOvalOpFactory_DEFINED