aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleShaders.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2016-10-28 15:42:34 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-10-28 20:06:17 +0000
commit7d954ad797176afedb9262fdea4507d0fc60eb9d (patch)
tree27c6dc324f83877371d91a58beb21e4b00176a94 /samplecode/SampleShaders.cpp
parent99e3f7d6fcb7b3b4340286455733a7de9eb4ef81 (diff)
remove xfermode from public api
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4020 CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot Change-Id: I19cd056f2af778f10e8c6c2b7b2735593b43dbac Reviewed-on: https://skia-review.googlesource.com/4020 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'samplecode/SampleShaders.cpp')
-rw-r--r--samplecode/SampleShaders.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 608199da44..ba3b80d7f8 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -34,8 +34,7 @@ static sk_sp<SkShader> make_bitmapfade(const SkBitmap& bm) {
auto shaderB = SkShader::MakeBitmapShader(bm,
SkShader::kClamp_TileMode, SkShader::kClamp_TileMode);
- return SkShader::MakeComposeShader(std::move(shaderB), std::move(shaderA),
- SkXfermode::Make(SkXfermode::kDstIn_Mode));
+ return SkShader::MakeComposeShader(std::move(shaderB), std::move(shaderA), SkBlendMode::kDstIn);
}
class ShaderView : public SampleView {
@@ -62,7 +61,7 @@ public:
auto shaderB = SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
fShader = SkShader::MakeComposeShader(std::move(shaderA), std::move(shaderB),
- SkXfermode::Make(SkXfermode::kDstIn_Mode));
+ SkBlendMode::kDstIn);
}
protected: