Fix mixed samples stencil clip

src/gpu/GrPipeline.cpp

Index: src/gpu/GrPipeline.cpp
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 073349be1ed900062964098d85773e416eedd75b..74a445fa42b2c99a692da9d1df3a5e4561343d0a 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -18,6 +18,8 @@
 
 GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
                                  GrPipelineOptimizations* opts) {
+    SkASSERT(!(args.fAdditionalFlags & args.fBlockedFlags));
+
     const GrPipelineBuilder& builder = *args.fPipelineBuilder;
 
     // Create XferProcessor from DS's XPFactory
@@ -63,13 +65,14 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
     pipeline->fStencilSettings = builder.getStencil();
     pipeline->fDrawFace = builder.getDrawFace();
 
-    pipeline->fFlags = 0;
+    pipeline->fFlags = args.fAdditionalFlags;
     if (builder.isHWAntialias()) {
         pipeline->fFlags |= kHWAA_Flag;
     }
     if (builder.snapVerticesToPixelCenters()) {
         pipeline->fFlags |= kSnapVertices_Flag;
     }
+    pipeline->fFlags &= ~args.fBlockedFlags;
 
     int firstColorProcessorIdx = args.fColorPOI.firstEffectiveProcessorIndex();