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.h | |
| 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.h')
| -rw-r--r-- | src/gpu/GrFixedClip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrFixedClip.h b/src/gpu/GrFixedClip.h index 6c350d5cba..7f18c2667f 100644 --- a/src/gpu/GrFixedClip.h +++ b/src/gpu/GrFixedClip.h @@ -42,7 +42,7 @@ public: bool quickContains(const SkRect&) const override; void getConservativeBounds(int w, int h, SkIRect* devResult, bool* iior) const override; - bool isRRect(const SkRect& rtBounds, SkRRect* rr, bool* aa) const override; + bool isRRect(const SkRect& rtBounds, SkRRect* rr, GrAA*) const override; bool apply(GrContext*, GrRenderTargetContext*, bool, bool, GrAppliedClip* out) const override; static const GrFixedClip& Disabled(); |