diff options
| author | Chris Craik <ccraik@google.com> | 2013-04-24 17:44:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-24 17:44:46 +0000 |
| commit | 69ca575b5bdfa023858db3fff11ec5c2a7b277a9 (patch) | |
| tree | 8a8584b3122461158e3fc7c77c927da66b924e21 /libs/hwui | |
| parent | a2e56c5a2fb909befa0d58ec30ce7e628ffff82a (diff) | |
| parent | 4a2bff7b387403ac976cd041cb5a1b57afa44d9c (diff) | |
| download | frameworks_base-69ca575b5bdfa023858db3fff11ec5c2a7b277a9.zip frameworks_base-69ca575b5bdfa023858db3fff11ec5c2a7b277a9.tar.gz frameworks_base-69ca575b5bdfa023858db3fff11ec5c2a7b277a9.tar.bz2 | |
Merge "Avoid incorrectly dirtying the functor output rect"
Diffstat (limited to 'libs/hwui')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 6fc2771..a4f9860 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -459,7 +459,7 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) { info.height = getSnapshot()->height; getSnapshot()->transform->copyTo(&info.transform[0]); - status_t result = (*functor)(DrawGlInfo::kModeDraw, &info) | DrawGlInfo::kStatusDrew; + status_t result = (*functor)(DrawGlInfo::kModeDraw, &info); if (result != DrawGlInfo::kStatusDone) { Rect localDirty(info.dirtyLeft, info.dirtyTop, info.dirtyRight, info.dirtyBottom); @@ -471,7 +471,7 @@ status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) { } resume(); - return result; + return result | DrawGlInfo::kStatusDrew; } /////////////////////////////////////////////////////////////////////////////// |