Fix mixed samples stencil clip

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
 #include "GrPipelineBuilder.h"
@@ skipping 15 matching lines @@
 class SkPath;
 
 /**
  * Produced by GrClipMaskManager. It provides a set of modifications to the drawing state that
  * are used to create the final GrPipeline for a GrBatch. This is a work in progress. It will
  * eventually encapsulate all mechanisms for modifying the scissor, shaders, and stencil state
  * to implement clipping.
  */
 class GrAppliedClip : public SkNoncopyable {
 public:
-    GrAppliedClip() {}
+    GrAppliedClip() : fAdditionalPipelineFlags(0), fBlockedPipelineFlags(0) {}
     const GrFragmentProcessor* clipCoverageFragmentProcessor() const { return fClipCoverageFP; }
     const GrScissorState& scissorState() const { return fScissorState; }
+    uint32_t additionalPipelineFlags() const { return fAdditionalPipelineFlags; }
+    uint32_t blockedPipelineFlags() const { return fBlockedPipelineFlags; }

[Chris Dalton, 2015/11/09 18:41:58]

This seemed like the right place to override the hwaa flags, but I'm not a huge
fan of the way it's done currently. Definitely open to suggestions.

[bsalomon, 2015/11/09 19:26:46]

Are the blocked flags used anywhere?

[Chris Dalton, 2015/11/09 19:49:36]

No, I only added it for philosophical reasons.. However, your other comment got
me thinking that the real problem here is that GrAppliedClip doesn't need to
expose pipeline flags, but rather can have a very specific option to do the one
thing GrClipMaskManager was using those flags for. I'll make the change.

 
 private:
     SkAutoTUnref<const GrFragmentProcessor> fClipCoverageFP;
     GrScissorState                          fScissorState;
+    uint32_t                                fAdditionalPipelineFlags;
+    uint32_t                                fBlockedPipelineFlags;
+
     friend class GrClipMaskManager;
 
     typedef SkNoncopyable INHERITED;
 };
 
 /**
  * The clip mask creator handles the generation of the clip mask. If anti
  * aliasing is requested it will (in the future) generate a single channel
  * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
  * mask in the stencil buffer. In the non anti-aliasing case, if the clip
@@ skipping 115 matching lines @@
     GrTexture* createCachedMask(int width, int height, const GrUniqueKey& key, bool renderTarget);
 
     static const int kMaxAnalyticElements = 4;
 
     GrDrawTarget*   fDrawTarget;    // This is our owning draw target.
     StencilClipMode fClipMode;
 
     typedef SkNoncopyable INHERITED;
 };
 #endif // GrClipMaskManager_DEFINED