summaryrefslogtreecommitdiff
path: root/libs/hwui/LayerRenderer.cpp
diff options
context:
space:
mode:
author Romain Guy <romainguy@google.com> 2011-03-15 23:50:43 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-03-15 23:50:43 -0700
commit89cc2b6422ce28bf3de1ac79b1daa0147b0eca88 (patch)
tree229a7902f5499ffe2132d4bc185a414693a77a90 /libs/hwui/LayerRenderer.cpp
parentf97e147e510afa25b4d933d8bfa1044f4996f128 (diff)
parentf8c4c12802b15da068d164fd44c9b9f12e7ed916 (diff)
am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1
* commit 'f8c4c12802b15da068d164fd44c9b9f12e7ed916': Fix performance issue in Launcher Bug #3515248
Diffstat (limited to 'libs/hwui/LayerRenderer.cpp')
-rw-r--r--libs/hwui/LayerRenderer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index b1eb164a9631..f92e20b841f9 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -92,7 +92,11 @@ Region* LayerRenderer::getRegion() {
void LayerRenderer::generateMesh() {
#if RENDER_LAYERS_AS_REGIONS
+#if RENDER_LAYERS_RECT_AS_RECT
if (mLayer->region.isRect() || mLayer->region.isEmpty()) {
+#else
+ if (mLayer->region.isEmpty()) {
+#endif
if (mLayer->mesh) {
delete mLayer->mesh;
delete mLayer->meshIndices;