Merge "Avoid tesselation path when useCenter is set" into jb-mr1-dev

ChrisCraik · Android (Google) Code Review · commit a84c963936bf · 2012-11-01T14:33:58.000-07:00
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
@@ -2433,7 +2433,7 @@ status_t OpenGLRenderer::drawArc(float left, float top, float right, float botto
     }
 
     // TODO: support fills (accounting for concavity if useCenter && sweepAngle > 180)
-    if (p->getStyle() != SkPaint::kStroke_Style || p->getPathEffect() != 0 || p->getStrokeCap() != SkPaint::kButt_Cap) {
+    if (p->getStyle() != SkPaint::kStroke_Style || p->getPathEffect() != 0 || p->getStrokeCap() != SkPaint::kButt_Cap || useCenter) {
         mCaches.activeTexture(0);
         const PathTexture* texture = mCaches.arcShapeCache.getArc(right - left, bottom - top,
                 startAngle, sweepAngle, useCenter, p);

Original file line number	Diff line number	Diff line change
`@@ -2433,7 +2433,7 @@ status_t OpenGLRenderer::drawArc(float left, float top, float right, float botto`
`2433`	`2433`	`}`
`2434`	`2434`
`2435`	`2435`	`// TODO: support fills (accounting for concavity if useCenter && sweepAngle > 180)`
`2436`		`- if (p->getStyle() != SkPaint::kStroke_Style \|\| p->getPathEffect() != 0 \|\| p->getStrokeCap() != SkPaint::kButt_Cap) {`
	`2436`	`+ if (p->getStyle() != SkPaint::kStroke_Style \|\| p->getPathEffect() != 0 \|\| p->getStrokeCap() != SkPaint::kButt_Cap \|\| useCenter) {`
`2437`	`2437`	`mCaches.activeTexture(0);`
`2438`	`2438`	`const PathTexture* texture = mCaches.arcShapeCache.getArc(right - left, bottom - top,`
`2439`	`2439`	`startAngle, sweepAngle, useCenter, p);`