commit 5ec22387ff4999407af7faaf6b0b6d0d01b1683b
author Mike Reed <reed@google.com> Thu Jan 14 21:59:01 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 15 16:47:16 2021 +0000
tree 1c1f03f040f68565776a1df68988b4557cc7c4eb
parent 4f4c064d5b749f139eb69d6e7f3852cb0fd53d4f

Simplify common case of linear filtering with no mips

Change-Id: I08b4a7bc088705b93a0aa680f6733d09c7ad23dd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354221
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>

samplecode/SampleCamera.cpp

diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index c9bb1c9..abde083 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -38,8 +38,7 @@
                 SkRect dst = { -150, -150, 150, 150 };
                 SkMatrix matrix;
                 matrix.setRectToRect(src, dst, SkMatrix::kFill_ScaleToFit);
-                fShaders.push_back(bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear,
-                                                                   SkMipmapMode::kNone),
+                fShaders.push_back(bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear),
                                                  matrix));
             }
         }

samplecode/SampleFilterBounds.cpp

diff --git a/samplecode/SampleFilterBounds.cpp b/samplecode/SampleFilterBounds.cpp
index d9d699d..072bbf3 100644
--- a/samplecode/SampleFilterBounds.cpp
+++ b/samplecode/SampleFilterBounds.cpp
@@ -183,7 +183,7 @@
         blurPaint.setImageFilter(fBlur);
         canvas->saveLayer(&localContentRect, &blurPaint);
         canvas->drawImageRect(fImage.get(), localContentRect, localContentRect,
-                              SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone),
+                              SkSamplingOptions(SkFilterMode::kLinear),
                               nullptr, SkCanvas::kFast_SrcRectConstraint);
         canvas->restore();
 

samplecode/SamplePatch.cpp

diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index cca913d..98dde31 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -34,8 +34,7 @@
     SkBitmap bm;
     decode_file(GetResourceAsData("images/dog.jpg"), &bm);
     *size = SkIPoint{bm.width(), bm.height()};
-    return bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear,
-                                           SkMipmapMode::kNone));
+    return bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear));
 }
 
 static sk_sp<SkShader> make_shader1(const SkIPoint& size) {

samplecode/SampleSlides.cpp

diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp
index b466c19..a17a674 100644
--- a/samplecode/SampleSlides.cpp
+++ b/samplecode/SampleSlides.cpp
@@ -245,8 +245,7 @@
 
     decode_file("/skimages/logo.gif", &bm);
     size->set(bm.width(), bm.height());
-    return bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear,
-                                           SkMipmapMode::kNone));
+    return bm.makeShader(SkSamplingOptions(SkFilterMode::kLinear));
 }
 
 static sk_sp<SkShader> make_shader1(const SkIPoint& size) {

samplecode/SampleVertices.cpp

diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index d8f8a52..d2c7fea 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -35,7 +35,7 @@
     pixels[1] = pixels[3] = color1;
 
     return bm.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat,
-                         SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone));
+                         SkSamplingOptions(SkFilterMode::kLinear));
 }
 
 static sk_sp<SkShader> make_shader1(const SkIPoint& size) {

samplecode/SampleXfer.cpp

diff --git a/samplecode/SampleXfer.cpp b/samplecode/SampleXfer.cpp
index d183220..40feb3b 100644
--- a/samplecode/SampleXfer.cpp
+++ b/samplecode/SampleXfer.cpp
@@ -218,9 +218,7 @@
             r.offset(r.width() + 10, 0);
             lm.postTranslate(r.width() + 10, 0);
 
-            paint.setShader(fImage->makeShader(SkSamplingOptions{ SkFilterMode::kLinear,
-                                                                  SkMipmapMode::kNone },
-                                               lm));
+            paint.setShader(fImage->makeShader(SkSamplingOptions(SkFilterMode::kLinear), lm));
             canvas->drawRect(r, paint);
 
             r.offset(r.width() + 10, 0);