Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev

Browse Source 
am: 1be9766a68

Change-Id: I8034dff9695425939a00b3f38d06615ffcc0f2b4
This commit is contained in:
Jim Van Verth
2017-04-13 20:16:17 +00:00
committed by android-build-merger
parent 76c71a01e2 1be9766a68
commit c7fd8db8a6
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp
View File

@@ -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<SkScalar(SkScalar, SkScalar)> 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