From 5745a0a37fa8b09e6ce538ab8ef58684cc00604e Mon Sep 17 00:00:00 2001 From: Jim Van Verth Date: Wed, 12 Apr 2017 14:08:46 -0400 Subject: [PATCH] Add uncached and perspective shadows to Skia renderer Test: manual - looked at FrameworkShadow app Bug: 37300468 Change-Id: I72d820479141db2d83363747d9f76abbaca70d98 --- .../pipeline/skia/ReorderBarrierDrawables.cpp | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp index d26eb59a039a8..68a08693249c0 100644 --- a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp +++ b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp @@ -190,9 +190,32 @@ void EndReorderBarrierDrawable::drawShadow(SkCanvas* canvas, RenderNodeDrawable* } const Vector3 lightPos = SkiaPipeline::getLightCenter(); SkPoint3 skiaLightPos = SkPoint3::Make(lightPos.x, lightPos.y, lightPos.z); - SkShadowUtils::DrawShadow(canvas, *casterPath, casterZValue, skiaLightPos, + if (shadowMatrix.hasPerspective() || revealClipPath || clippedToBounds) { + std::function casterHeightFunc; + if (shadowMatrix.hasPerspective()) { + // get the matrix with the full 3D transform + mat4 zMatrix; + caster->getRenderNode()->applyViewPropertyTransforms(zMatrix, true); + SkScalar A = zMatrix[2]; + SkScalar B = zMatrix[6]; + SkScalar C = zMatrix[mat4::kTranslateZ]; + casterHeightFunc = [A, B, C](SkScalar x, SkScalar y) { + return A*x + B*y + C; // casterZValue already baked into C + }; + } else { + casterHeightFunc = [casterZValue] (SkScalar, SkScalar) { + return casterZValue; + }; + } + + SkShadowUtils::DrawUncachedShadow(canvas, *casterPath, casterHeightFunc, skiaLightPos, SkiaPipeline::getLightRadius(), ambientAlpha, spotAlpha, SK_ColorBLACK, casterAlpha < 1.0f ? SkShadowFlags::kTransparentOccluder_ShadowFlag : 0); + } else { + SkShadowUtils::DrawShadow(canvas, *casterPath, casterZValue, skiaLightPos, + SkiaPipeline::getLightRadius(), ambientAlpha, spotAlpha, SK_ColorBLACK, + casterAlpha < 1.0f ? SkShadowFlags::kTransparentOccluder_ShadowFlag : 0); + } } }; // namespace skiapipeline