summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-04-16 13:50:16 -0700
committerChris Craik <ccraik@google.com>2013-04-22 15:00:52 -0700
commit4a2bff7b387403ac976cd041cb5a1b57afa44d9c (patch)
tree235677253345a16decf6519e76131c05882f6fa5
parent7ffb2fb3daf05459267745643689cc0e5875e659 (diff)
downloadframeworks_base-4a2bff7b387403ac976cd041cb5a1b57afa44d9c.zip
frameworks_base-4a2bff7b387403ac976cd041cb5a1b57afa44d9c.tar.gz
frameworks_base-4a2bff7b387403ac976cd041cb5a1b57afa44d9c.tar.bz2
Avoid incorrectly dirtying the functor output rect
bug:8640186 Change-Id: I360cb85e59cfdd0b499561e92b81089341d07046
-rw-r--r--libs/hwui/OpenGLRenderer.cpp4
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;
}
///////////////////////////////////////////////////////////////////////////////