commit 554aabbaa8e8e14f8ab608201e513d9304daddd3
author Mike Reed <reed@google.com> Sat Feb 13 10:12:53 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sat Feb 13 18:06:43 2021 +0000
tree a5f5f2a31c18794fabae6c37698fda147bcf7647
parent 4f065e286df6863b86dcf7382a4bb78e56b39626

Prepare flag to hide setFilterQuality

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

gm/pictureshader.cpp

diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp
index 6f22043..9306e80 100644
--- a/gm/pictureshader.cpp
+++ b/gm/pictureshader.cpp
@@ -226,6 +226,7 @@
     canvas->drawPaint(p);
 }
 
+#ifdef SK_SUPPORT_LEGACY_SETFILTERQUALITY
 /*
     Test picture-shader's filtering (after the tile is created.
     The GM draws a 2x2 grid of tiled images (circle, square, X)
@@ -287,3 +288,4 @@
         canvas->drawRect({0, 0, 300, 300}, paint);
     }
 }
+#endif

gm/runtimeshader.cpp

diff --git a/gm/runtimeshader.cpp b/gm/runtimeshader.cpp
index ac09a0a..774b7b9 100644
--- a/gm/runtimeshader.cpp
+++ b/gm/runtimeshader.cpp
@@ -277,10 +277,7 @@
 
         builder.child("input")        = fMandrill->makeShader(sampling);
 
-        // TODO: Move filter quality to the shader itself. We need to enforce at least kLow here
-        // so that we bilerp the color cube image.
         SkPaint paint;
-        paint.setFilterQuality(kLow_SkFilterQuality);
 
         // TODO: Should we add SkImage::makeNormalizedShader() to handle this automatically?
         SkMatrix normalize = SkMatrix::Scale(1.0f / (kSize * kSize), 1.0f / kSize);

include/core/SkPaint.h

diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 6176a02..88ea4f4 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -23,7 +23,7 @@
 class SkPathEffect;
 class SkShader;
 
-// WIP to eventually remove filter-quality
+// Move to clients when they are ready -- aid in deprecating the enum
 #define SK_SUPPORT_LEGACY_SETFILTERQUALITY
 
 /** \class SkPaint
@@ -192,9 +192,6 @@
     */
     void setDither(bool dither) { fBitfields.fDither = static_cast<unsigned>(dither); }
 
-#ifndef SK_SUPPORT_LEGACY_SETFILTERQUALITY
-private:
-#endif
     /** Returns SkFilterQuality, the image filtering level. A lower setting
         draws faster; a higher setting looks better when the image is scaled.
     */
@@ -202,6 +199,9 @@
         return (SkFilterQuality)fBitfields.fFilterQuality;
     }
 
+#ifndef SK_SUPPORT_LEGACY_SETFILTERQUALITY
+private:
+#endif
     /** Sets SkFilterQuality, the image filtering level. A lower setting
         draws faster; a higher setting looks better when the image is scaled.
         Does not check to see if quality is valid.