diff options
| author | 2014-11-21 15:51:04 -0800 | |
|---|---|---|
| committer | 2014-11-21 15:51:04 -0800 | |
| commit | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (patch) | |
| tree | 7a1842dd8f8b9b8e1880df7a3fe0fc7f5d103d48 /libs/hwui/SpotShadow.cpp | |
| parent | fa6547f6c0aad15c308a4ba946955087081ae1eb (diff) | |
| parent | 220c3f4f48b53b6010093a1ef437f4197a382ebf (diff) | |
resolved conflicts for merge of 220c3f4f to master
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
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 b3cfde2f7521..a2e7f890221e 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) { |