Use GrAAType in instanced rendering.

Change-Id: Ifb5a33f908de618d66fcb0dd329f064c1ecfcd63
Reviewed-on: https://skia-review.googlesource.com/9082
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/gpu/instanced/InstancedRenderingTypes.h b/src/gpu/instanced/InstancedRenderingTypes.h
index 4e0c3d3d95..402f6e9fb2 100644
--- a/src/gpu/instanced/InstancedRenderingTypes.h
+++ b/src/gpu/instanced/InstancedRenderingTypes.h
@@ -42,15 +42,6 @@ enum class Attrib : uint8_t {
 };
 constexpr int kNumAttribs = 1 + (int)Attrib::kLocalRect;
 
-// TODO: replace with GrAAType?
-enum class AntialiasMode : uint8_t {
-    kNone,
-    kCoverage,
-    kMSAA,
-    kMixedSamples
-};
-constexpr int kNumAntialiasModes = 1 + (int)AntialiasMode::kMixedSamples;
-
 enum class ShapeType : uint8_t {
     kRect,
     kOval,
@@ -133,9 +124,12 @@ struct OpInfo {
         return !((fShapeTypes & ~kRect_ShapeFlag) | fInnerShapeTypes);
     }
 
+    GrAAType aaType() const { return static_cast<GrAAType>(fAAType); }
+    void setAAType(GrAAType aaType) { fAAType = static_cast<uint8_t>(aaType); }
+
     union {
         struct {
-            AntialiasMode   fAntialiasMode;
+            uint8_t         fAAType;  // GrAAType
             uint8_t         fShapeTypes;
             uint8_t         fInnerShapeTypes;
             bool            fHasPerspective               : 1;
@@ -151,7 +145,7 @@ struct OpInfo {
 };
 
 inline bool OpInfo::CanCombine(const OpInfo& a, const OpInfo& b) {
-    if (a.fAntialiasMode != b.fAntialiasMode) {
+    if (a.fAAType != b.fAAType) {
         return false;
     }
     if (SkToBool(a.fInnerShapeTypes) != SkToBool(b.fInnerShapeTypes)) {