diff options
author | 2016-12-08 10:35:19 -0500 | |
---|---|---|
committer | 2016-12-08 16:27:44 +0000 | |
commit | 9f549358b3ac9f61e78b194e39d6ac6eb322e35e (patch) | |
tree | 870b370b9985b1863abf4b1df0cce6d6f6ad5ac5 /include/gpu/GrClip.h | |
parent | 978ccebd8af61417ecdb6d45a31cc68657eee752 (diff) |
Remove antialiasing control from GrPaint.
This adds an additional param (of new enum type GrAA) to draws that can antialias and a new enum GrAAType to indicate the AA technique (none, fragment shader computed coverage, msaa).
Some GMs change due to this:
1) In some places we weren't disabling MSAA when the draw was supposed to be unantialiased.
2) Some bounding rect draws that use GrFragmentProcessors were unnecessarily turning on antialiasing, by disabling it a very small number of pixel LSBs change.
Change-Id: I7d8d8793dda70bcd373d09055beb9949c1a8a4d0
Reviewed-on: https://skia-review.googlesource.com/5608
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/gpu/GrClip.h')
-rw-r--r-- | include/gpu/GrClip.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h index 2d4c1f2628..9bf2da205e 100644 --- a/include/gpu/GrClip.h +++ b/include/gpu/GrClip.h @@ -8,6 +8,7 @@ #ifndef GrClip_DEFINED #define GrClip_DEFINED +#include "GrTypes.h" #include "SkRect.h" #include "SkRRect.h" @@ -45,7 +46,7 @@ public: * @return true if the clip is equivalent to a single rrect, false otherwise. * */ - virtual bool isRRect(const SkRect& rtBounds, SkRRect* rrect, bool* aa) const = 0; + virtual bool isRRect(const SkRect& rtBounds, SkRRect* rrect, GrAA* aa) const = 0; /** * This is the maximum distance that a draw may extend beyond a clip's boundary and still count @@ -140,7 +141,7 @@ private: bool apply(GrContext*, GrRenderTargetContext*, bool, bool, GrAppliedClip*) const final { return true; } - bool isRRect(const SkRect&, SkRRect*, bool*) const override { return false; } + bool isRRect(const SkRect&, SkRRect*, GrAA*) const override { return false; } }; #endif |