commit 777e146564b419c3826672571fb02f4b7aae9184
author Brian Salomon <bsalomon@google.com> Fri Feb 28 21:10:31 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 02 15:03:52 2020 +0000
tree fcf616901ef6f4534308887a49bbb25696254b06
parent 5a109c7c9b287695cdb6b1ddc49a401de023b3f5

Remove domain-uses-decal code from GrTextureProducer

Instead pass wrap modes to createFragmentProcessor.

Rename GrTextureProducer::hasMixedResolutions() to
isPlanar() and use to determine whether to attempt
simple texture draw (that would flatten).


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

src/gpu/GrTextureAdjuster.cpp

diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index 07c080e..6867e40 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -16,9 +16,8 @@
 GrTextureAdjuster::GrTextureAdjuster(GrRecordingContext* context,
                                      GrSurfaceProxyView original,
                                      const GrColorInfo& colorInfo,
-                                     uint32_t uniqueID,
-                                     bool useDecal)
-        : INHERITED(context, {colorInfo, original.proxy()->dimensions()}, useDecal)
+                                     uint32_t uniqueID)
+        : INHERITED(context, {colorInfo, original.proxy()->dimensions()})
         , fOriginal(std::move(original))
         , fUniqueID(uniqueID) {}
 
@@ -83,6 +82,8 @@
         const SkRect& constraintRect,
         FilterConstraint filterConstraint,
         bool coordsLimitedToConstraintRect,
+        GrSamplerState::WrapMode wrapX,
+        GrSamplerState::WrapMode wrapY,
         const GrSamplerState::Filter* filterOrNullForBicubic) {
     GrSurfaceProxyView view;
     if (filterOrNullForBicubic) {
@@ -115,6 +116,7 @@
     }
     SkASSERT(kNoDomain_DomainMode == domainMode ||
              (domain.fLeft <= domain.fRight && domain.fTop <= domain.fBottom));
-    return this->createFragmentProcessorForDomainAndFilter(
-            std::move(view), textureMatrix, domainMode, domain, filterOrNullForBicubic);
+    return this->createFragmentProcessorForSubsetAndFilter(std::move(view), textureMatrix,
+                                                           domainMode, domain, wrapX, wrapY,
+                                                           filterOrNullForBicubic);
 }