commit 0cd9c621a29beaa73b5efcfeb1512f1b6b33d5db
author Jason Sams <jsams@google.com> Thu Mar 21 02:15:16 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 02:15:16 2013 +0000
tree d4d7a630720dfd4b8478156cb25b6d11cf83e78a
parent d84ad3f1a23f69c09ca98505522c05880c937bbf
parent 89e20d27effd875431087a9188b20386b9c5aff0

Merge "Fix usage bits in ImageProcessing." into jb-mr2-dev

java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
index 8cf46c2..975027a 100644
--- a/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
+++ b/java/tests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
@@ -424,8 +424,16 @@
 
 
         mRS = RenderScript.create(this);
-        mInPixelsAllocation = Allocation.createFromBitmap(mRS, mBitmapIn);
-        mInPixelsAllocation2 = Allocation.createFromBitmap(mRS, mBitmapIn2);
+        mInPixelsAllocation = Allocation.createFromBitmap(mRS, mBitmapIn,
+                                                          Allocation.MipmapControl.MIPMAP_NONE,
+                                                          Allocation.USAGE_SHARED |
+                                                          Allocation.USAGE_GRAPHICS_TEXTURE |
+                                                          Allocation.USAGE_SCRIPT);
+        mInPixelsAllocation2 = Allocation.createFromBitmap(mRS, mBitmapIn2,
+                                                           Allocation.MipmapControl.MIPMAP_NONE,
+                                                           Allocation.USAGE_SHARED |
+                                                           Allocation.USAGE_GRAPHICS_TEXTURE |
+                                                           Allocation.USAGE_SCRIPT);
         mOutPixelsAllocation = Allocation.createFromBitmap(mRS, mBitmapOut);