diff options
| -rw-r--r-- | libs/hwui/DisplayListRenderer.h | 1 | ||||
| -rw-r--r-- | libs/hwui/PathCache.cpp | 5 | ||||
| -rw-r--r-- | tests/HwAccelerationTest/src/com/android/test/hwui/PathsCacheActivity.java | 31 |
3 files changed, 24 insertions, 13 deletions
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h index 90a7145..4a299c6 100644 --- a/libs/hwui/DisplayListRenderer.h +++ b/libs/hwui/DisplayListRenderer.h @@ -462,6 +462,7 @@ private: SkPath* pathCopy = mPathMap.valueFor(path); if (pathCopy == NULL || pathCopy->getGenerationID() != path->getGenerationID()) { pathCopy = new SkPath(*path); + pathCopy->setSourcePath(path); // replaceValueFor() performs an add if the entry doesn't exist mPathMap.replaceValueFor(path, pathCopy); mPaths.add(pathCopy); diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index e09c243..e363b73 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -83,6 +83,11 @@ void PathCache::clearGarbage() { } PathTexture* PathCache::get(SkPath* path, SkPaint* paint) { + const SkPath* sourcePath = path->getSourcePath(); + if (sourcePath && sourcePath->getGenerationID() == path->getGenerationID()) { + path = const_cast<SkPath*>(sourcePath); + } + PathCacheEntry entry(path, paint); PathTexture* texture = mCache.get(entry); diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/PathsCacheActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/PathsCacheActivity.java index b8ad823..9ab2a86 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/PathsCacheActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/PathsCacheActivity.java @@ -92,19 +92,24 @@ public class PathsCacheActivity extends Activity { canvas.restore(); -// Path path = makePath(); -// int r = mRandom.nextInt(10); -// if (r == 5 || r == 3) { -// mPathList.add(path); -// } else if (r == 9) { -// mPathList.clear(); -// } -// -// canvas.save(); -// canvas.translate(550.0f + mRandom.nextInt(50), 60.0f + mRandom.nextInt(50)); -// canvas.drawPath(path, mMediumPaint); -// canvas.restore(); -// + for (int i = 0; i < mRandom.nextInt(20); i++) { + Path path = makePath(); + int r = mRandom.nextInt(10); + if (r == 5 || r == 3) { + mPathList.add(path); + } + + canvas.save(); + canvas.translate(450.0f + mRandom.nextInt(200), mRandom.nextInt(200)); + canvas.drawPath(path, mMediumPaint); + canvas.restore(); + } + + int r = mRandom.nextInt(100); + if (r == 50) { + mPathList.clear(); + } + invalidate(); } } |