aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrRenderTargetContext.cpp
diff options
context:
space:
mode:
authorGravatar Stephen White <senorblanco@chromium.org>2018-05-26 16:38:31 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-26 16:58:43 +0000
commit95ef524734d522295b72106b185e9b4ee0463b87 (patch)
tree39e9b55a4887f5171be628387c511054227bc526 /src/gpu/GrRenderTargetContext.cpp
parente2343a1d0997ca715275a9fb2079b8514c6f8c19 (diff)
Revert "Turn off domain in GrTextureOp when src rect contains entire proxy"
This reverts commit 869433fa113d1573d5d91fcafdca413b247ce1b0. Reason for revert: possibly preventing Chromium roll (layout tests) Original change's description: > 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> TBR=bsalomon@google.com,robertphillips@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I8afc3c05b504ccde7d44e973d707f4cba1dc51b1 Reviewed-on: https://skia-review.googlesource.com/130302 Reviewed-by: Stephen White <senorblanco@chromium.org> Commit-Queue: Stephen White <senorblanco@chromium.org>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.cpp')
-rw-r--r--src/gpu/GrRenderTargetContext.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 456d8e4a82..f4db697e41 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -776,22 +776,13 @@ 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,