commit b612b6cfa0594030fd458395050e65a8c83c1692
author Mike Reed <reed@google.com> Tue Dec 08 21:58:35 2020 -0500
committer Mike Reed <reed@google.com> Wed Dec 09 03:08:09 2020 +0000
tree df750dab98980a2e647d8d9b37ddd7539b05a42d
parent fde98cbddd43576389d1f10881276583835b0281

Revert "Revert "Use explicit samplingoptions""

Undo pictureshader change from prev version

This reverts commit fde98cbddd43576389d1f10881276583835b0281.

Change-Id: I52fe7d2753dee91fd08ae26f38e47ecd933d0c94
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/342378
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/complexclip.cpp

diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index b285ffa..e2da27c 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -394,7 +394,7 @@
                                                         gradLM ? &persp : nullptr);
         bool imageLM = config.fLM == kImageWithLocalMat || config.fLM == kBothWithLocalMat;
         auto imgShader = img->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
-                                         imageLM ? perspScale : scale);
+                                         SkSamplingOptions(), imageLM ? perspScale : scale);
 
         // Perspective before any clipShader
         if (config.fConcat == kConcatBeforeClips) {
@@ -449,7 +449,8 @@
     SkRect rect = SkRect::MakeWH(256, 256);
     SkMatrix local = SkMatrix::MakeRectToRect(SkRect::MakeWH(image->width(), image->height()),
                                               SkRect::MakeWH(64, 64), SkMatrix::kFill_ScaleToFit);
-    auto shader = image->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, &local);
+    auto shader = image->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
+                                    SkSamplingOptions(), &local);
 
     SkPaint paint;
     paint.setColor(SK_ColorRED);