diff options
| author |  dvonbeck <dvonbeck@google.com> | 2016-07-10 18:38:33 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-10 18:38:34 -0700 |
| commit | 6af677ff8f549751352847ceefda4538236c8a20 (patch) | |
| tree | 9a95a87e2c9903938117cbf334c5b35695317d50 /gm | |
| parent | 3ab14ca950d98a5c4d4c4a5f96ea8b0c984e0116 (diff) | |
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
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/lightingshader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index 3b1c224f2b..2cf4a953d8 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -100,12 +100,14 @@ protected: const SkMatrix& ctm = canvas->getTotalMatrix(); SkPaint paint; + sk_sp<SkShader> diffuseShader = SkMakeBitmapShader(fDiffuse, + SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, nullptr); sk_sp<SkShader> normalMap = SkMakeBitmapShader(fNormalMaps[mapType], SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, nullptr); sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap), ctm); - paint.setShader(SkLightingShader::Make(fDiffuse, fLights, &matrix, - std::move(normalSource))); + paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource), + fLights)); canvas->drawRect(r, paint); } |