diff options
author | Brian Salomon <bsalomon@google.com> | 2018-05-25 10:08:05 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-25 14:41:52 +0000 |
commit | 869433fa113d1573d5d91fcafdca413b247ce1b0 (patch) | |
tree | 92c495186273db105c0dc7803457cac63298981b /src | |
parent | 71e83e85074187fce322851546e05f435cb8c7c4 (diff) |
Turn off domain in GrTextureOp when src rect contains entire proxy
Move check for turning off domain when nearest/no-aa to GrRenderTargetContext.
Change-Id: I3c071b5f73fb3134218453204f30c3020c9dad9a
Reviewed-on: https://skia-review.googlesource.com/130143
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 11 | ||||
-rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index f4db697e41..456d8e4a82 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -776,13 +776,22 @@ void GrRenderTargetContext::drawTexture(const GrClip& clip, sk_sp<GrTextureProxy if (filter != GrSamplerState::Filter::kNearest && !must_filter(srcRect, dstRect, viewMatrix)) { filter = GrSamplerState::Filter::kNearest; } + GrAAType aaType = this->chooseAAType(aa, GrAllowMixedSamples::kNo); + if (constraint == SkCanvas::kStrict_SrcRectConstraint) { + // No need to use a texture domain with nearest filtering unless there is AA bloating. + // Also, no need if the srcRect contains the entire texture. + if (filter == GrSamplerState::Filter::kNearest && aaType != GrAAType::kCoverage) { + constraint = SkCanvas::kFast_SrcRectConstraint; + } else if (srcRect.contains(proxy->getWorstCaseBoundsRect())) { + constraint = SkCanvas::kFast_SrcRectConstraint; + } + } SkRect clippedDstRect = dstRect; SkRect clippedSrcRect = srcRect; if (!crop_filled_rect(this->width(), this->height(), clip, viewMatrix, &clippedDstRect, &clippedSrcRect)) { return; } - GrAAType aaType = this->chooseAAType(aa, GrAllowMixedSamples::kNo); bool allowSRGB = SkToBool(this->colorSpaceInfo().colorSpace()); this->addDrawOp(clip, GrTextureOp::Make(std::move(proxy), filter, color, clippedSrcRect, clippedDstRect, aaType, constraint, viewMatrix, diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 4d0c41d127..5724050234 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -709,11 +709,6 @@ __attribute__((no_sanitize("float-cast-overflow"))) , fFinalized(0) , fAllowSRGBInputs(allowSRGBInputs ? 1 : 0) { SkASSERT(aaType != GrAAType::kMixedSamples); - // No need to use a texture domain with nearest filtering unless there is AA bloating. - if (constraint == SkCanvas::kStrict_SrcRectConstraint && - filter == GrSamplerState::Filter::kNearest && GrAAType::kCoverage != aaType) { - constraint = SkCanvas::kFast_SrcRectConstraint; - } const Draw& draw = fDraws.emplace_back(srcRect, 0, GrPerspQuad(dstRect, viewMatrix), constraint, color); |