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/GrImageTextureMaker.cpp

diff --git a/src/gpu/GrImageTextureMaker.cpp b/src/gpu/GrImageTextureMaker.cpp
index 79388c0..766d918 100644
--- a/src/gpu/GrImageTextureMaker.cpp
+++ b/src/gpu/GrImageTextureMaker.cpp
@@ -25,8 +25,8 @@
 }
 
 GrImageTextureMaker::GrImageTextureMaker(GrRecordingContext* context, const SkImage* client,
-                                         SkImage::CachingHint chint, bool useDecal)
-        : INHERITED(context, get_image_info(context, client), useDecal)
+                                         SkImage::CachingHint chint)
+        : INHERITED(context, get_image_info(context, client))
         , fImage(static_cast<const SkImage_Lazy*>(client))
         , fCachingHint(chint) {
     SkASSERT(client->isLazyGenerated());
@@ -38,9 +38,8 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-GrYUVAImageTextureMaker::GrYUVAImageTextureMaker(GrContext* context, const SkImage* client,
-                                                 bool useDecal)
-        : INHERITED(context, client->imageInfo(), useDecal)
+GrYUVAImageTextureMaker::GrYUVAImageTextureMaker(GrContext* context, const SkImage* client)
+        : INHERITED(context, client->imageInfo())
         , fImage(static_cast<const SkImage_GpuYUVA*>(client)) {
     SkASSERT(as_IB(client)->isYUVA());
 }
@@ -58,19 +57,20 @@
 }
 
 std::unique_ptr<GrFragmentProcessor> GrYUVAImageTextureMaker::createFragmentProcessor(
-    const SkMatrix& textureMatrix,
-    const SkRect& constraintRect,
-    FilterConstraint filterConstraint,
-    bool coordsLimitedToConstraintRect,
-    const GrSamplerState::Filter* filterOrNullForBicubic) {
-
+        const SkMatrix& textureMatrix,
+        const SkRect& constraintRect,
+        FilterConstraint filterConstraint,
+        bool coordsLimitedToConstraintRect,
+        GrSamplerState::WrapMode wrapX,
+        GrSamplerState::WrapMode wrapY,
+        const GrSamplerState::Filter* filterOrNullForBicubic) {
     // Check simple cases to see if we need to fall back to flattening the image (or whether it's
-    // already been flattened.)
-    if (!filterOrNullForBicubic || this->domainNeedsDecal() || fImage->fRGBView.proxy()) {
-        return this->INHERITED::createFragmentProcessor(textureMatrix, constraintRect,
-                                                        filterConstraint,
-                                                        coordsLimitedToConstraintRect,
-                                                        filterOrNullForBicubic);
+    // already been flattened.) GrYUVtoRGBEffect only supports kClamp (for now.)
+    if (!filterOrNullForBicubic || wrapX != GrSamplerState::WrapMode::kClamp ||
+        wrapY != GrSamplerState::WrapMode::kClamp || fImage->fRGBView.proxy()) {
+        return this->INHERITED::createFragmentProcessor(
+                textureMatrix, constraintRect, filterConstraint, coordsLimitedToConstraintRect,
+                wrapX, wrapY, filterOrNullForBicubic);
     }
 
     // Check to see if the client has given us pre-mipped textures or we can generate them