Revert "Remove GrAAType from GrFillRRectOp"
This reverts commit 43e73df990cfb7edf7df9639689dabc44b4fadad.
Reason for revert: Changed msaa behavior for non-aa
Original change's description:
> Remove GrAAType from GrFillRRectOp
>
> Replaces it with GrAA. This op always uses analytic coverage,
> regardless of MSAA state.
>
> Bug: skia:11396
> Change-Id: I75174a00bdb3b1f62319de5970aac7f1bbae8e10
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/383418
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,csmartdalton@google.com
Change-Id: I780e46b58a2af1512d17e9db0b53d205f6df51d4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11396
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/383857
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index 6aa0667..7556d15 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -937,7 +937,7 @@
}
if (!op && style.isSimpleFill()) {
assert_alive(paint);
- op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, rrect, aa);
+ op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, rrect, aaType);
}
if (!op && GrAAType::kCoverage == aaType) {
assert_alive(paint);
@@ -1363,7 +1363,7 @@
// ovals the exact same way we do round rects.
assert_alive(paint);
op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, SkRRect::MakeOval(oval),
- aa);
+ aaType);
}
if (!op && GrAAType::kCoverage == aaType) {
assert_alive(paint);