summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-11-02 16:23:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-02 16:23:22 -0700
commite113710ebd10c254ed54171b64e8557298ded34e (patch)
tree7a6b21c5f3f41b29b4eb14c7a81f18ed674c0318 /libs/ui
parent0754fc6ec9dc5af91ec60004dc0f260aef8ec2f5 (diff)
parentb801624dc4f03c930ec35f406f07fa5fd8f65dd9 (diff)
downloadframeworks_native-e113710ebd10c254ed54171b64e8557298ded34e.zip
frameworks_native-e113710ebd10c254ed54171b64e8557298ded34e.tar.gz
frameworks_native-e113710ebd10c254ed54171b64e8557298ded34e.tar.bz2
Merge "Optimize FBO drawing with regions. This optimization is currently disabled until Launcher is modified to take advantage of it. The optimization can be enabled by turning on RENDER_LAYERS_AS_REGIONS in the OpenGLRenderer.h file."
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/Region.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
index 12db908..1994f6a 100644
--- a/libs/ui/Region.cpp
+++ b/libs/ui/Region.cpp
@@ -289,7 +289,7 @@ private:
void flushSpan() {
bool merge = false;
if (tail-head == ssize_t(span.size())) {
- Rect const* p = cur;
+ Rect const* p = span.editArray();
Rect const* q = head;
if (p->top == q->bottom) {
merge = true;