commit 9195f75df0d2503b4134be7e0deb7699c1613381
author Romain Guy <romainguy@google.com> Wed Nov 03 16:23:41 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 03 16:23:41 2010 -0700
tree 3e24d5d410c16c0ff364e21ae9efe4a23c2de0c4
parent 26e37349831476d3225570af2dfbf1e459374c6b
parent 5ec9924d24495822b589f1a17996655d66273b30

Merge "Fix rendering issue with layers."

libs/hwui/OpenGLRenderer.cpp

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 @@
     mSaveCount--;
     mSnapshot = previous;
 
-    if (restoreLayer) {
-        composeLayer(current, previous);
-    }
-
     if (restoreClip) {
         dirtyClip();
     }
 
+    if (restoreLayer) {
+        composeLayer(current, previous);
+    }
+
     return restoreClip;
 }
 
@@ -447,6 +447,7 @@
     inverse.mapRect(clip);
     clip.snapToPixelBoundaries();
     clip.intersect(bounds);
+    clip.translate(-bounds.left, -bounds.top);
 
     snapshot->flags |= Snapshot::kFlagIsFboLayer;
     snapshot->fbo = layer->fbo;

tests/HwAccelerationTest/AndroidManifest.xml

diff --git a/tests/HwAccelerationTest/AndroidManifest.xml b/tests/HwAccelerationTest/AndroidManifest.xml
index 196b0eb..7f3a968 100644
--- a/tests/HwAccelerationTest/AndroidManifest.xml
+++ b/tests/HwAccelerationTest/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.test.hwui">
 
+    <uses-permission android:name="android.permission.INTERNET" />    
+    
     <application
         android:label="HwUi"
         android:hardwareAccelerated="true">