From 6af677ff8f549751352847ceefda4538236c8a20 Mon Sep 17 00:00:00 2001 From: dvonbeck Date: Sun, 10 Jul 2016 18:38:33 -0700 Subject: Changed SkLightingShader API to take in a shader as color source This CL's base is the CL for the same modification, but in the implementation side: https://codereview.chromium.org/2062703003/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2064153002 Review-Url: https://codereview.chromium.org/2064153002 --- samplecode/SampleLighting.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'samplecode/SampleLighting.cpp') diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp index 5949f4961b..c191a6c749 100755 --- a/samplecode/SampleLighting.cpp +++ b/samplecode/SampleLighting.cpp @@ -70,8 +70,10 @@ protected: SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr, nullptr); sk_sp normalSource = SkNormalSource::MakeFromNormalMap( std::move(normalMap), SkMatrix::I()); - paint.setShader(SkLightingShader::Make(fDiffuseBitmap, std::move(lights), nullptr, - std::move(normalSource))); + sk_sp diffuseShader = SkBitmapProcShader::MakeBitmapShader(fDiffuseBitmap, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, nullptr); + paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource), + std::move(lights))); paint.setColor(SK_ColorBLACK); SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(), -- cgit v1.2.3