commit 36a35e366a65980843b96759f863643f17ca1ee7
author Chris Craik <ccraik@google.com> Wed Feb 18 09:24:33 2015 -0800
committer Chris Craik <ccraik@google.com> Wed Feb 18 17:47:21 2015 +0000
tree c4eba90c7c54625044e7fc97d09e31021065aeeb
parent 6c770900d6dc96b98c980c23f4a62ccf30a36586

Fix layer shader to store layer pointer

bug:19419672

Change-Id: I4277348ceab41fbf45a107a8b21f64e2b4af23e0

libs/hwui/SkiaShader.cpp

diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp
index 81531e8..2fcf7f3 100644
--- a/libs/hwui/SkiaShader.cpp
+++ b/libs/hwui/SkiaShader.cpp
@@ -685,7 +685,7 @@
     }
 
     description->hasBitmap = true;
-
+    outData->layer = layer;
     outData->bitmapSampler = (*textureUnit)++;
 
     const float width = layer->getWidth();

tests/HwAccelerationTest/res/layout/projection_clipping.xml

diff --git a/tests/HwAccelerationTest/res/layout/projection_clipping.xml b/tests/HwAccelerationTest/res/layout/projection_clipping.xml
index 7177fc8f..1f2b939 100644
--- a/tests/HwAccelerationTest/res/layout/projection_clipping.xml
+++ b/tests/HwAccelerationTest/res/layout/projection_clipping.xml
@@ -14,13 +14,13 @@
             android:id="@+id/clickable1"
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:background="?android:attr/selectableItemBackground"/>
+            android:background="?android:attr/selectableItemBackgroundBorderless"/>
         <View
             android:id="@+id/clickable2"
             android:translationX="50dp"
             android:translationY="10dp"
             android:layout_width="150dp"
             android:layout_height="100dp"
-            android:background="?android:attr/selectableItemBackground"/>
+            android:background="?android:attr/selectableItemBackgroundBorderless"/>
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>