Implement support for mixed sampled render targets

src/gpu/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"
@@ skipping 41 matching lines @@
     fGpu->unref();
 }
 
 bool GrStencilAndCoverPathRenderer::canDrawPath(const GrDrawTarget* target,
                                                 const GrPipelineBuilder* pipelineBuilder,
                                                 const SkMatrix& viewMatrix,
                                                 const SkPath& path,
                                                 const SkStrokeRec& stroke,
                                                 bool antiAlias) const {
     return !stroke.isHairlineStyle() &&
-           !antiAlias && // doesn't do per-path AA, relies on the target having MSAA
+           (!antiAlias || // doesn't do per-path AA, relies on the target having MSAA
+           pipelineBuilder->getRenderTarget()->isMultisampled(kStencil_GrSampleConfig)) &&
            pipelineBuilder->getStencil().isDisabled();
 }
 
 GrPathRenderer::StencilSupport
 GrStencilAndCoverPathRenderer::onGetStencilSupport(const GrDrawTarget*,
                                                    const GrPipelineBuilder*,
                                                    const SkPath&,
                                                    const SkStrokeRec&) const {
     return GrPathRenderer::kStencilOnly_StencilSupport;
 }
@@ skipping 21 matching lines @@
     target->stencilPath(pipelineBuilder, pp, p, convert_skpath_filltype(path.getFillType()));
 }
 
 bool GrStencilAndCoverPathRenderer::onDrawPath(GrDrawTarget* target,
                                                GrPipelineBuilder* pipelineBuilder,
                                                GrColor color,
                                                const SkMatrix& viewMatrix,
                                                const SkPath& path,
                                                const SkStrokeRec& stroke,
                                                bool antiAlias) {
-    SkASSERT(!antiAlias);
+    SkASSERT(!antiAlias ||
+             pipelineBuilder->getRenderTarget()->isMultisampled(kStencil_GrSampleConfig));
     SkASSERT(!stroke.isHairlineStyle());
 
     SkASSERT(pipelineBuilder->getStencil().isDisabled());
 
     SkAutoTUnref<GrPath> p(get_gr_path(fGpu, path, stroke));
 
     if (path.isInverseFillType()) {
         GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
             kZero_StencilOp,
             kZero_StencilOp,
@@ skipping 37 matching lines @@
             kNotEqual_StencilFunc,
             0xffff,
             0x0000,
             0xffff);
 
         pipelineBuilder->setStencil(kStencilPass);
         SkAutoTUnref<GrPathProcessor> pp(GrPathProcessor::Create(color, viewMatrix));
         target->drawPath(pipelineBuilder, pp, p, convert_skpath_filltype(path.getFillType()));
     }
 
     pipelineBuilder->stencil()->setDisabled();

[Chris Dalton, 2015/03/14 02:51:30]

After https://codereview.chromium.org/1002013006/, add:

  pipelineBuilder->enableState(kHWAntialias_StateBit);

[Chris Dalton, 2015/03/16 07:30:49]

Oops, actually this needs to be in an if, so intentionally aliased rendering
stays aliased.

  if (antiAlias) {
     
SkASSERT(pipelineBuilder->getRenderTarget()->isMultisampled(kStencil_GrSampleConfig));
      pipelineBuilder->enableState(kHWAntialias_StateBit);
  }

     return true;
 }