Fix GrDrawContextPriv::stencilRect

src/gpu/GrDrawContext.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchTest.h"
 #include "GrColor.h"
 #include "GrDrawContext.h"
@@ skipping 393 matching lines @@
                                     GrPathRendering::FillType fill) {
     fDrawContext->getDrawTarget()->stencilPath(pipelineBuilder, fDrawContext,
                                                clip, viewMatrix, path, fill);
 }
 
 void GrDrawContextPriv::stencilRect(const GrFixedClip& clip,
                                     const GrUserStencilSettings* ss,
                                     bool doAA,
                                     const SkMatrix& viewMatrix,
                                     const SkRect& rect) {
     ASSERT_SINGLE_OWNER_PRIV

[bsalomon, 2016/06/10 00:21:13]

Should we assert or fail if doAA is true and the RT isn't multisampled? Also,
perhaps we should rename the param useMSAA? And maybe comment in the .h that
this can only aa if the rt is msaa?

[csmartdalton, 2016/06/10 02:43:38]

Done. Went with useHWAA to match GrPB and the other callsites in this file.

     RETURN_IF_ABANDONED_PRIV
     SkDEBUGCODE(fDrawContext->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fDrawContext->fAuditTrail, "GrDrawContext::stencilRect");
 
     AutoCheckFlush acf(fDrawContext->fDrawingManager);
 
     GrPaint paint;
     paint.setAntiAlias(doAA);
     paint.setXPFactory(GrDisableColorXPFactory::Make());
 
-    bool useHWAA;
+    GrPipelineBuilder pipelineBuilder(paint, doAA && fDrawContext->isStencilBufferMultisampled());
+    pipelineBuilder.setUserStencil(ss);
+
     SkAutoTUnref<GrDrawBatch> batch(
-        fDrawContext->getFillRectBatch(paint, viewMatrix, rect, &useHWAA));
-    SkASSERT(batch);
-
-    GrPipelineBuilder pipelineBuilder(paint, useHWAA);
-    pipelineBuilder.setUserStencil(ss);
+        GrRectBatchFactory::CreateNonAAFill(SK_ColorWHITE, viewMatrix, rect, nullptr, nullptr));
 
     fDrawContext->getDrawTarget()->drawBatch(pipelineBuilder, fDrawContext, clip, batch);
 }
 
 bool GrDrawContextPriv::drawAndStencilRect(const GrFixedClip& clip,
                                            const GrUserStencilSettings* ss,
                                            SkRegion::Op op,
                                            bool invert,
                                            bool doAA,
                                            const SkMatrix& viewMatrix,
@@ skipping 622 matching lines @@
 
 void GrDrawContext::drawBatch(const GrPipelineBuilder& pipelineBuilder, const GrClip& clip,
                               GrDrawBatch* batch) {
     ASSERT_SINGLE_OWNER
     RETURN_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
     GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrDrawContext::drawBatch");
 
     this->getDrawTarget()->drawBatch(pipelineBuilder, this, clip, batch);
 }