Use samplingoptions in imageshader
Change-Id: I7d94fe7aed702afd0626a40db201caaf7c2a7764
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/342927
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index 2fa82a7..04fc98a 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -179,16 +179,15 @@
// clamp/clamp shader
SkPaint clampPaint;
- clampPaint.setFilterQuality(q);
- clampPaint.setShader(fGradImgs[i]->makeShader());
+ clampPaint.setShader(fGradImgs[i]->makeShader(SkSamplingOptions(q)));
canvas->drawRect(SkRect::MakeWH(1.5f*w, 1.5f*h), clampPaint);
canvas->translate(1.5f*w + kPad, 0);
// repeat/mirror shader
SkPaint repeatPaint;
- repeatPaint.setFilterQuality(q);
repeatPaint.setShader(fGradImgs[i]->makeShader(SkTileMode::kRepeat,
- SkTileMode::kMirror));
+ SkTileMode::kMirror,
+ SkSamplingOptions(q)));
canvas->drawRect(SkRect::MakeWH(1.5f*w, 1.5f*h), repeatPaint);
canvas->translate(1.5f*w + kPad, 0);
@@ -220,11 +219,11 @@
SkMatrix lm;
lm.setRotate(45.f, 1, 1);
lm.postScale(6.5f, 6.5f);
- auto shader = fSmallImg->makeShader(static_cast<SkTileMode>(tx),
- static_cast<SkTileMode>(ty), &lm);
SkPaint paint;
- paint.setShader(std::move(shader));
- paint.setFilterQuality(static_cast<SkFilterQuality>(fq));
+ paint.setShader(fSmallImg->makeShader(static_cast<SkTileMode>(tx),
+ static_cast<SkTileMode>(ty),
+ SkSamplingOptions((SkFilterQuality)fq),
+ lm));
canvas->drawRect(dstRect, paint);
canvas->translate(dstRect.width() + kPad, 0);
}