Don't batch large instanced rects with other shapes

src/gpu/instanced/InstancedRenderingTypes.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef gr_instanced_InstancedRenderingTypes_DEFINED
 #define gr_instanced_InstancedRenderingTypes_DEFINED
 
@@ skipping 106 matching lines @@
 
 GR_STATIC_ASSERT(0 == offsetof(ParamsTexel, fX));
 GR_STATIC_ASSERT(4 * 4 == sizeof(ParamsTexel));
 
 /**
  * Tracks all information needed in order to draw a batch of instances. This struct also serves
  * as an all-in-one shader key for the batch.
  */
 struct BatchInfo {
     BatchInfo() : fData(0) {}
+    explicit BatchInfo(uint32_t data) : fData(data) {}
+
+    static bool CanCombine(const BatchInfo& a, const BatchInfo& b);
 
     bool isSimpleRects() const {
         return !((fShapeTypes & ~kRect_ShapeFlag) | fInnerShapeTypes);
     }
 
-    bool canJoin(BatchInfo that) const {
-        if (fAntialiasMode != that.fAntialiasMode) {
-            return false;
-        }
-        if (SkToBool(fInnerShapeTypes) != SkToBool(that.fInnerShapeTypes)) {
-            // GrInstanceProcessor can't currently combine draws with and without inner shapes.
-            return false;
-        }
-        if (fCannotDiscard != that.fCannotDiscard) {
-            // For stencil draws, the use of discard can be a requirement.
-            return false;
-        }
-        return true;
-    }
-
-    void join(BatchInfo that) {
-        SkASSERT(this->canJoin(that));
-        fData |= that.fData;
-    }
-
     union {
         struct {
             AntialiasMode   fAntialiasMode;
             uint8_t         fShapeTypes;
             uint8_t         fInnerShapeTypes;
             bool            fHasPerspective               : 1;
             bool            fHasLocalMatrix               : 1;
             bool            fHasParams                    : 1;
             bool            fNonSquare                    : 1;
             bool            fUsesLocalCoords              : 1;
             bool            fCannotTweakAlphaForCoverage  : 1;
             bool            fCannotDiscard                : 1;
         };
         uint32_t fData;
     };
 };
 
 // This is required since all the data must fit into 32 bits of a shader key.
 GR_STATIC_ASSERT(sizeof(uint32_t) == sizeof(BatchInfo));
 GR_STATIC_ASSERT(kNumShapeTypes <= 8);
 
+inline bool BatchInfo::CanCombine(const BatchInfo& a, const BatchInfo& b) {
+    if (a.fAntialiasMode != b.fAntialiasMode) {
+        return false;
+    }
+    if (SkToBool(a.fInnerShapeTypes) != SkToBool(b.fInnerShapeTypes)) {
+        // GrInstanceProcessor can't currently combine draws with and without inner shapes.
+        return false;
+    }
+    if (a.fCannotDiscard != b.fCannotDiscard) {
+        // For stencil draws, the use of discard can be a requirement.
+        return false;
+    }
+    return true;
+}
+
+inline BatchInfo operator|(const BatchInfo& a, const BatchInfo& b) {
+    SkASSERT(BatchInfo::CanCombine(a, b));
+    return BatchInfo(a.fData | b.fData);
+}
+
 template<typename T> struct TRange {
     bool operator ==(const TRange& that) const {
         return fStart == that.fStart && fCount == that.fCount;
     }
     bool operator !=(const TRange& that) const { return !(*this == that); }
 
     bool isEmpty() const { return fCount <= 0; }
     T end() { return fStart + fCount; }
 
     T fStart;
     T fCount;
 };
 
 typedef TRange<int16_t> IndexRange;
 typedef TRange<int> InstanceRange;
 
 }
 
 #endif