commit 0ea330703e723bdf3038742d594dd13e2f33c770
author Brian Salomon <bsalomon@google.com> Tue Jul 14 10:43:42 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 14 20:27:59 2020 +0000
tree 547d3f5847bf25ad411a1f3f9092f66b10c8e18c
parent 252a3c0e115d48cb7aeb5b0ff4ba4c3b41b70d23

Make GrTextureProducer take optional subset and domain rects

Split bicubic into separate functions.

Removes usage of null GrSamplerState::Filter to indicate bicubic.

Bug: skia:10344

Change-Id: Ife649ba84afe3a06d7d8fb0d46677ce96fc264dc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302636
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index b6fd72d..08017ea 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -436,14 +436,8 @@
     if (mf && as_MFB(mf)->hasFragmentProcessor()) {
         mf = nullptr;
     }
-    const GrSamplerState::Filter* filterMode = doBicubic ? nullptr : &fm;
 
-    GrTextureProducer::FilterConstraint constraintMode;
-    if (SkCanvas::kFast_SrcRectConstraint == constraint) {
-        constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
-    } else {
-        constraintMode = GrTextureAdjuster::kYes_FilterConstraint;
-    }
+    bool restrictToSubset = SkCanvas::kStrict_SrcRectConstraint == constraint;
 
     // If we have to outset for AA then we will generate texture coords outside the src rect. The
     // same happens for any mask filter that extends the bounds rendered in the dst.
@@ -451,13 +445,12 @@
     bool coordsAllInsideSrcRect = aaFlags == GrQuadAAFlags::kNone && !mf;
 
     // Check for optimization to drop the src rect constraint when on bilerp.
-    if (filterMode && GrSamplerState::Filter::kBilerp == *filterMode &&
-        GrTextureAdjuster::kYes_FilterConstraint == constraintMode && coordsAllInsideSrcRect &&
-        !producer->isPlanar()) {
+    if (!doBicubic && fm == GrSamplerState::Filter::kBilerp && restrictToSubset &&
+        coordsAllInsideSrcRect && !producer->isPlanar()) {
         SkMatrix combinedMatrix;
         combinedMatrix.setConcat(ctm, srcToDst);
         if (can_ignore_bilerp_constraint(*producer, src, combinedMatrix, rtc->numSamples())) {
-            constraintMode = GrTextureAdjuster::kNo_FilterConstraint;
+            restrictToSubset = false;
         }
     }
 
@@ -469,8 +462,14 @@
             return;
         }
     }
-    auto fp = producer->createFragmentProcessor(textureMatrix, src, constraintMode,
-                                                coordsAllInsideSrcRect, wm, wm, filterMode);
+    const SkRect* subset = restrictToSubset       ? &src : nullptr;
+    const SkRect* domain = coordsAllInsideSrcRect ? &src : nullptr;
+    std::unique_ptr<GrFragmentProcessor> fp;
+    if (doBicubic) {
+        fp = producer->createBicubicFragmentProcessor(textureMatrix, subset, domain, wm, wm);
+    } else {
+        fp = producer->createFragmentProcessor(textureMatrix, subset, domain, {wm, fm});
+    }
     fp = GrColorSpaceXformEffect::Make(std::move(fp),
                                        producer->colorSpace(), producer->alphaType(),
                                        rtc->colorInfo().colorSpace(), kPremul_SkAlphaType);