diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-09 14:06:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 19:56:24 +0000 |
| commit | 3944484020d98ff8f386378296106c321279482b (patch) | |
| tree | a77a4a189b715cc544656929d3d3d71be3aca622 /src/gpu/GrFixedClip.cpp | |
| parent | d263413a2a92cafe3fd3b051c67d00206c9a0e4d (diff) | |
Reland "Remove antialiasing control from GrPaint."
This contains fixes for GLPrograms test and mixed samples rendering.
This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.
BUG=skia:
Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
Reviewed-on: https://skia-review.googlesource.com/5763
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrFixedClip.cpp')
| -rw-r--r-- | src/gpu/GrFixedClip.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrFixedClip.cpp b/src/gpu/GrFixedClip.cpp index 79e26624d2..d584ee119e 100644 --- a/src/gpu/GrFixedClip.cpp +++ b/src/gpu/GrFixedClip.cpp @@ -29,7 +29,7 @@ void GrFixedClip::getConservativeBounds(int w, int h, SkIRect* devResult, bool* } } -bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const { +bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, GrAA* aa) const { if (fWindowRectsState.enabled()) { return false; } @@ -39,7 +39,7 @@ bool GrFixedClip::isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const { return false; } rr->setRect(rect); - *aa = false; + *aa = GrAA::kNo; return true; } return false; |