commit 99c944647fccc67206fbfede479fddeab8c27576
author Mike Reed <reed@google.com> Tue Dec 08 13:16:56 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 08 20:33:23 2020 +0000
tree e9d7684fc20f450a6f3b317f22b98af1ada94e04
parent fb2c2d2d597177b6331531ced500bc28230df1b1

Add flag to hide non-sampling imageshader factories

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

samplecode/Sample3D.cpp

diff --git a/samplecode/Sample3D.cpp b/samplecode/Sample3D.cpp
index 1c55a3f..5bfb00c 100644
--- a/samplecode/Sample3D.cpp
+++ b/samplecode/Sample3D.cpp
@@ -363,9 +363,9 @@
     void onOnceBeforeDraw() override {
         fRR = SkRRect::MakeRectXY({20, 20, 380, 380}, 50, 50);
         auto img = GetResourceAsImage("images/brickwork-texture.jpg");
-        fImgShader = img->makeShader(SkMatrix::Scale(2, 2));
+        fImgShader = img->makeShader(SkSamplingOptions(), SkMatrix::Scale(2, 2));
         img = GetResourceAsImage("images/brickwork_normal-map.jpg");
-        fBmpShader = img->makeShader(SkMatrix::Scale(2, 2));
+        fBmpShader = img->makeShader(SkSamplingOptions(), SkMatrix::Scale(2, 2));
 
         const char code[] = R"(
             uniform shader color_map;

samplecode/SampleClip.cpp

diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 4a6c25d..115071b 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -498,7 +498,7 @@
     void onOnceBeforeDraw() override {
         fPath = make_path();
         fShader = GetResourceAsImage("images/mandrill_128.png")
-                        ->makeShader(SkMatrix::Scale(3, 3));
+                        ->makeShader(SkSamplingOptions(), SkMatrix::Scale(3, 3));
     }
 
     bool onChar(SkUnichar uni) override {
@@ -571,7 +571,7 @@
         fPatch[10] = {  0, 200 };
         fPatch[11] = {  0, 100 };
 
-        fShader = GetResourceAsImage("images/mandrill_256.png")->makeShader();
+        fShader = GetResourceAsImage("images/mandrill_256.png")->makeShader(SkSamplingOptions());
     }
 
     void onDrawContent(SkCanvas* canvas) override {

samplecode/SampleFilterQuality.cpp

diff --git a/samplecode/SampleFilterQuality.cpp b/samplecode/SampleFilterQuality.cpp
index 56d0721..b0e6f18 100644
--- a/samplecode/SampleFilterQuality.cpp
+++ b/samplecode/SampleFilterQuality.cpp
@@ -28,7 +28,7 @@
 
 static sk_sp<SkShader> make_shader(const SkRect& bounds) {
     sk_sp<SkImage> image(GetResourceAsImage("images/mandrill_128.png"));
-    return image ? image->makeShader() : nullptr;
+    return image ? image->makeShader(SkSamplingOptions()) : nullptr;
 }
 
 #define N   128

samplecode/SampleXfer.cpp

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index 23789fd..d183220 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -212,16 +212,15 @@
 
             SkMatrix lm = SkMatrix::Translate(r.x(), r.y())
                         * SkMatrix::Scale(10, 10);
-            paint.setShader(fImage->makeShader(SkTileMode::kClamp, SkTileMode::kClamp, &lm));
+            paint.setShader(fImage->makeShader(SkSamplingOptions(), lm));
             canvas->drawRect(r, paint);
 
             r.offset(r.width() + 10, 0);
             lm.postTranslate(r.width() + 10, 0);
 
-            paint.setShader(fImage->makeShader(SkTileMode::kClamp, SkTileMode::kClamp,
-                                               SkSamplingOptions{ SkFilterMode::kLinear,
+            paint.setShader(fImage->makeShader(SkSamplingOptions{ SkFilterMode::kLinear,
                                                                   SkMipmapMode::kNone },
-                                               &lm));
+                                               lm));
             canvas->drawRect(r, paint);
 
             r.offset(r.width() + 10, 0);