summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2010-11-03 16:23:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-03 16:23:41 -0700
commit9195f75df0d2503b4134be7e0deb7699c1613381 (patch)
tree3e24d5d410c16c0ff364e21ae9efe4a23c2de0c4 /libs
parent26e37349831476d3225570af2dfbf1e459374c6b (diff)
parent5ec9924d24495822b589f1a17996655d66273b30 (diff)
downloadframeworks_base-9195f75df0d2503b4134be7e0deb7699c1613381.zip
frameworks_base-9195f75df0d2503b4134be7e0deb7699c1613381.tar.gz
frameworks_base-9195f75df0d2503b4134be7e0deb7699c1613381.tar.bz2
Merge "Fix rendering issue with layers."
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 0f0316f..855a4e0 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -240,14 +240,14 @@ bool OpenGLRenderer::restoreSnapshot() {
mSaveCount--;
mSnapshot = previous;
- if (restoreLayer) {
- composeLayer(current, previous);
- }
-
if (restoreClip) {
dirtyClip();
}
+ if (restoreLayer) {
+ composeLayer(current, previous);
+ }
+
return restoreClip;
}
@@ -447,6 +447,7 @@ bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, sp<Snapshot> sna
inverse.mapRect(clip);
clip.snapToPixelBoundaries();
clip.intersect(bounds);
+ clip.translate(-bounds.left, -bounds.top);
snapshot->flags |= Snapshot::kFlagIsFboLayer;
snapshot->fbo = layer->fbo;