Replace targetHasUnifiedMultisampling in GrPB constructor

src/gpu/batches/GrStencilAndCoverPathRenderer.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrStencilAndCoverPathRenderer.h"
 #include "GrCaps.h"
@@ skipping 57 matching lines @@
 
 void GrStencilAndCoverPathRenderer::onStencilPath(const StencilPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onStencilPath");
     SkASSERT(!args.fIsAA || args.fDrawContext->isStencilBufferMultisampled());
 
     GrPaint paint;
     SkSafeUnref(paint.setXPFactory(GrDisableColorXPFactory::Create()));
     paint.setAntiAlias(args.fIsAA);
 
-    GrPipelineBuilder pipelineBuilder(paint, args.fDrawContext->isUnifiedMultisampled());
-    pipelineBuilder.setState(GrPipelineBuilder::kHWAntialias_Flag, args.fIsAA);
+    const GrPipelineBuilder pipelineBuilder(paint, args.fIsAA);
 
     SkASSERT(!args.fPath->isInverseFillType());
     SkAutoTUnref<GrPath> path(get_gr_path(fResourceProvider, *args.fPath, GrStyle::SimpleFill()));
     args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder,
                                                      *args.fClip,
                                                      *args.fViewMatrix,
                                                      path,
                                                      path->getFillType());
 }
 
 bool GrStencilAndCoverPathRenderer::onDrawPath(const DrawPathArgs& args) {
     GR_AUDIT_TRAIL_AUTO_FRAME(args.fDrawContext->auditTrail(),
                               "GrStencilAndCoverPathRenderer::onDrawPath");
+    SkASSERT(!args.fPaint->isAntiAlias() || args.fDrawContext->isStencilBufferMultisampled());
     SkASSERT(!args.fStyle->strokeRec().isHairlineStyle());
     const SkPath& path = *args.fPath;
     const SkMatrix& viewMatrix = *args.fViewMatrix;
 
     SkAutoTUnref<GrPath> p(get_gr_path(fResourceProvider, path, *args.fStyle));
 
     if (path.isInverseFillType()) {
         static constexpr GrUserStencilSettings kInvertedCoverPass(
             GrUserStencilSettings::StaticInit<
                 0x0000,
                 // We know our rect will hit pixels outside the clip and the user bits will be 0
                 // outside the clip. So we can't just fill where the user bits are 0. We also need
                 // to check that the clip bit is set.
                 GrUserStencilTest::kEqualIfInClip,
                 0xffff,
                 GrUserStencilOp::kKeep,
                 GrUserStencilOp::kZero,
                 0xffff>()
         );
 
         // fake inverse with a stencil and cover
         {
-            GrPipelineBuilder pipelineBuilder(*args.fPaint,
-                                              args.fDrawContext->isUnifiedMultisampled());
+            GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fPaint->isAntiAlias());
             pipelineBuilder.setUserStencil(&kInvertedCoverPass);
-            if (args.fAntiAlias) {
-                SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
-                pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
-            }
 
             args.fDrawContext->drawContextPriv().stencilPath(pipelineBuilder, *args.fClip,
                                                              viewMatrix, p, p->getFillType());
         }
 
         SkMatrix invert = SkMatrix::I();
         SkRect bounds =
             SkRect::MakeLTRB(0, 0,
                              SkIntToScalar(args.fDrawContext->width()),
                              SkIntToScalar(args.fDrawContext->height()));
         SkMatrix vmi;
         // mapRect through persp matrix may not be correct
         if (!viewMatrix.hasPerspective() && viewMatrix.invert(&vmi)) {
             vmi.mapRect(&bounds);
             // theoretically could set bloat = 0, instead leave it because of matrix inversion
             // precision.
             SkScalar bloat = viewMatrix.getMaxScale() * SK_ScalarHalf;
             bounds.outset(bloat, bloat);
         } else {
             if (!viewMatrix.invert(&invert)) {
                 return false;
             }
         }
         const SkMatrix& viewM = viewMatrix.hasPerspective() ? SkMatrix::I() : viewMatrix;
 
-        SkAutoTUnref<GrDrawBatch> batch(
+        SkAutoTUnref<GrDrawBatch> coverBatch(
                 GrRectBatchFactory::CreateNonAAFill(args.fColor, viewM, bounds, nullptr,
                                                     &invert));
 
         {
             GrPipelineBuilder pipelineBuilder(*args.fPaint,
-                                              args.fDrawContext->isUnifiedMultisampled());
+                                              args.fPaint->isAntiAlias() &&
+                                              !args.fDrawContext->hasMixedSamples());
             pipelineBuilder.setUserStencil(&kInvertedCoverPass);
-            if (args.fAntiAlias) {
-                SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
-                pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
-            }
-            if (args.fDrawContext->hasMixedSamples()) {
-                pipelineBuilder.disableState(GrPipelineBuilder::kHWAntialias_Flag);
-            }
 
-            args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
+            args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, coverBatch);
         }
     } else {
         static constexpr GrUserStencilSettings kCoverPass(
             GrUserStencilSettings::StaticInit<
                 0x0000,
                 GrUserStencilTest::kNotEqual,
                 0xffff,
                 GrUserStencilOp::kZero,
                 GrUserStencilOp::kKeep,
                 0xffff>()
         );
 
         SkAutoTUnref<GrDrawBatch> batch(
                 GrDrawPathBatch::Create(viewMatrix, args.fColor, p->getFillType(), p));
 
-        GrPipelineBuilder pipelineBuilder(*args.fPaint,
-                                          args.fDrawContext->isUnifiedMultisampled());
+        GrPipelineBuilder pipelineBuilder(*args.fPaint, args.fPaint->isAntiAlias());
         pipelineBuilder.setUserStencil(&kCoverPass);
         if (args.fAntiAlias) {
             SkASSERT(args.fDrawContext->isStencilBufferMultisampled());
             pipelineBuilder.enableState(GrPipelineBuilder::kHWAntialias_Flag);
         }
 
         args.fDrawContext->drawBatch(pipelineBuilder, *args.fClip, batch);
     }
 
     return true;
 }