diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-03-01 14:34:41 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-01 20:16:45 +0000 |
| commit | 5ff3a5c13e579d6840e49e6ccd75b586f76582a6 (patch) | |
| tree | e7d5148ed45175c5aa26839b1e9252b119766e05 /src/gpu | |
| parent | 2800c5eba2e20f48f3ebeac00a226b6b40de5bf6 (diff) | |
Remove stencil related flags from GrInstancedPipelineInfo.
Change-Id: Ieeb8ada92b5196473d5cea77350fd994bfff8916
Reviewed-on: https://skia-review.googlesource.com/9086
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/instanced/InstancedRendering.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gpu/instanced/InstancedRendering.cpp b/src/gpu/instanced/InstancedRendering.cpp index 127dca3b03..f142d99865 100644 --- a/src/gpu/instanced/InstancedRendering.cpp +++ b/src/gpu/instanced/InstancedRendering.cpp @@ -120,7 +120,7 @@ std::unique_ptr<InstancedRendering::Op> InstancedRendering::recordShape( std::unique_ptr<Op> op = this->makeOp(); op->fInfo.setAAType(*aaType); op->fInfo.fShapeTypes = GetShapeFlag(type); - op->fInfo.fCannotDiscard = !info.fCanDiscard; + op->fInfo.fCannotDiscard = true; Instance& instance = op->getSingleInstance(); instance.fInfo = (int)type << kShapeType_InfoBit; @@ -199,16 +199,11 @@ std::unique_ptr<InstancedRendering::Op> InstancedRendering::recordShape( inline bool InstancedRendering::selectAntialiasMode(const SkMatrix& viewMatrix, GrAA aa, const GrInstancedPipelineInfo& info, GrAAType* aaType) { - SkASSERT(!info.fColorDisabled || info.fDrawingShapeToStencil); SkASSERT(!info.fIsMixedSampled || info.fIsMultisampled); SkASSERT(GrCaps::InstancedSupport::kNone != fGpu->caps()->instancedSupport()); if (!info.fIsMultisampled || fGpu->caps()->multisampleDisableSupport()) { if (GrAA::kNo == aa) { - if (info.fDrawingShapeToStencil && !info.fCanDiscard) { - // We can't draw to the stencil buffer without discard (or sample mask if MSAA). - return false; - } *aaType = GrAAType::kNone; return true; } @@ -221,7 +216,7 @@ inline bool InstancedRendering::selectAntialiasMode(const SkMatrix& viewMatrix, if (info.fIsMultisampled && fGpu->caps()->instancedSupport() >= GrCaps::InstancedSupport::kMultisampled) { - if (!info.fIsMixedSampled || info.fColorDisabled) { + if (!info.fIsMixedSampled) { *aaType = GrAAType::kMSAA; return true; } |