diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/SpotShadow.cpp | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
| download | frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.zip frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.gz frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.bz2 | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/SpotShadow.cpp')
| -rw-r--r-- | libs/hwui/SpotShadow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/SpotShadow.cpp b/libs/hwui/SpotShadow.cpp index a2e7f89..b3cfde2 100644 --- a/libs/hwui/SpotShadow.cpp +++ b/libs/hwui/SpotShadow.cpp @@ -871,7 +871,7 @@ inline Vector2 getCloserVertex(const Vector2& umbraVertex, const Vector2& centro /** * Generate a triangle strip given two convex polygon **/ -void SpotShadow::generateTriangleStrip(bool isCasterOpaque, float /* shadowStrengthScale */, +void SpotShadow::generateTriangleStrip(bool isCasterOpaque, float shadowStrengthScale, Vector2* penumbra, int penumbraLength, Vector2* umbra, int umbraLength, const Vector3* poly, int polyLength, VertexBuffer& shadowTriangleStrip, const Vector2& centroid) { |