diff options
| author |  Mike Reed <reed@google.com> | 2016-10-28 15:42:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-28 20:06:17 +0000 |
| commit | 7d954ad797176afedb9262fdea4507d0fc60eb9d (patch) | |
| tree | 27c6dc324f83877371d91a58beb21e4b00176a94 /samplecode/PerlinPatch.cpp | |
| parent | 99e3f7d6fcb7b3b4340286455733a7de9eb4ef81 (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/PerlinPatch.cpp')
| -rw-r--r-- | samplecode/PerlinPatch.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp index a2033c35ff..9adb08afea 100644 --- a/samplecode/PerlinPatch.cpp +++ b/samplecode/PerlinPatch.cpp @@ -148,12 +148,10 @@ protected: { fTexX - texWidth, fTexY + texHeight}} ; - sk_sp<SkXfermode> xfer(SkXfermode::Make(SkXfermode::kSrc_Mode)); - SkScalar scaleFreq = 2.0; fShader1 = SkPerlinNoiseShader2::MakeImprovedNoise(fXFreq/scaleFreq, fYFreq/scaleFreq, 4, fSeed); - fShaderCompose = SkShader::MakeComposeShader(fShader0, fShader1, nullptr); + fShaderCompose = SkShader::MakeComposeShader(fShader0, fShader1, SkBlendMode::kSrcOver); paint.setShader(fShaderCompose); @@ -161,7 +159,7 @@ protected: if (fShowGrid) { tex = nullptr; } - canvas->drawPatch(fPts, nullptr, tex, xfer, paint); + canvas->drawPatch(fPts, nullptr, tex, SkBlendMode::kSrc, paint); draw_control_points(canvas, fPts); } |