Fix mixed samples stencil clip

src/gpu/GrClipMaskManager.h

Index: src/gpu/GrClipMaskManager.h
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 98fd3af351c355c5f0116f11790c635c7e8e11ae..4a91ede6a6a2987fc94144b46cc61e266c218695 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -33,13 +33,18 @@ class SkPath;
  */
 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;