summaryrefslogtreecommitdiff
path: root/libs/hwui/SpotShadow.cpp
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-11-21 14:19:06 -0800
committer Andreas Gampe <agampe@google.com> 2014-11-21 14:19:06 -0800
commit2ab8298dc37851aab4623ba3f98d71055d653a73 (patch)
treee31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/SpotShadow.cpp
parent4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff)
parent99377df12ee696e01cd9071132f122801a9862ce (diff)
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/SpotShadow.cpp')
-rw-r--r--libs/hwui/SpotShadow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/SpotShadow.cpp b/libs/hwui/SpotShadow.cpp
index 3046fd5daacc..df068e6c8113 100644
--- a/libs/hwui/SpotShadow.cpp
+++ b/libs/hwui/SpotShadow.cpp
@@ -870,7 +870,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) {