summaryrefslogtreecommitdiffstats
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2013-02-20 10:42:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-20 10:42:40 -0800
commitc4ca87f0f4034d4b987084d2b62ed7e5e0430557 (patch)
tree72ae034904f9554d1ed6228944e7711959fc21d7 /libs/hwui/OpenGLRenderer.cpp
parent09bd2113e3a6bb2c63f01b62a09ae3c23d3c0454 (diff)
parent8a47d8eaec26d0937aee94a057f561f246748339 (diff)
downloadframeworks_base-c4ca87f0f4034d4b987084d2b62ed7e5e0430557.zip
frameworks_base-c4ca87f0f4034d4b987084d2b62ed7e5e0430557.tar.gz
frameworks_base-c4ca87f0f4034d4b987084d2b62ed7e5e0430557.tar.bz2
am 8a47d8ea: Merge "Clean up clipping and deferral logic"
* commit '8a47d8eaec26d0937aee94a057f561f246748339': Clean up clipping and deferral logic
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index e545931..c271795 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1235,6 +1235,8 @@ bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state) {
// quick rejected
return true;
}
+ } else {
+ state.mBounds.set(currentClip);
}
state.mClip.set(currentClip);