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 --- tests/SerializationTest.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/SerializationTest.cpp') diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 1e96eefd54..88f88fc2ac 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -585,8 +585,11 @@ DEF_TEST(Serialization, reporter) { SkShader::kClamp_TileMode, &matrix, nullptr); sk_sp normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap), ctm); - sk_sp lightingShader = SkLightingShader::Make(diffuse, fLights, &matrix, - std::move(normalSource)); + sk_sp diffuseShader = SkMakeBitmapShader(diffuse, SkShader::kClamp_TileMode, + SkShader::kClamp_TileMode, &matrix, nullptr); + sk_sp lightingShader = SkLightingShader::Make(std::move(diffuseShader), + std::move(normalSource), + fLights); SkAutoTUnref(TestFlattenableSerialization(lightingShader.get(), true, reporter)); // TODO test equality? -- cgit v1.2.3