From f9485d0313bd1950ff329eca63751cb58cddb0b9 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Wed, 9 Jan 2013 16:33:57 -0800 Subject: Update IP2 to use bitmap-backed allocations. Change-Id: I2967fff71db40b4a8a00cd0152bcc04c43b87f80 --- .../com/android/rs/image/ImageProcessingActivity2.java | 2 +- .../src/com/android/rs/image/TestBase.java | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'tests/RenderScriptTests') diff --git a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ImageProcessingActivity2.java b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ImageProcessingActivity2.java index 227518fbd32c..19bea43460a0 100644 --- a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ImageProcessingActivity2.java +++ b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ImageProcessingActivity2.java @@ -229,7 +229,7 @@ public class ImageProcessingActivity2 extends Activity break; } - mTest.createBaseTest(this, mBitmapIn, mBitmapIn2); + mTest.createBaseTest(this, mBitmapIn, mBitmapIn2, mBitmapOut); setupBars(); mTest.runTest(); diff --git a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/TestBase.java b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/TestBase.java index 9df2eff5b06d..dbbc5940666e 100644 --- a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/TestBase.java +++ b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/TestBase.java @@ -88,18 +88,14 @@ public class TestBase { return false; } - public final void createBaseTest(ImageProcessingActivity2 ipact, Bitmap b, Bitmap b2) { + public final void createBaseTest(ImageProcessingActivity2 ipact, Bitmap b, Bitmap b2, Bitmap outb) { act = ipact; mRS = RenderScript.create(act); - mInPixelsAllocation = Allocation.createFromBitmap(mRS, b, - Allocation.MipmapControl.MIPMAP_NONE, - Allocation.USAGE_SCRIPT); - mInPixelsAllocation2 = Allocation.createFromBitmap(mRS, b2, - Allocation.MipmapControl.MIPMAP_NONE, - Allocation.USAGE_SCRIPT); - mOutPixelsAllocation = Allocation.createFromBitmap(mRS, b, - Allocation.MipmapControl.MIPMAP_NONE, - Allocation.USAGE_SCRIPT); + + mInPixelsAllocation = Allocation.createFromBitmap(mRS, b); + mInPixelsAllocation2 = Allocation.createFromBitmap(mRS, b2); + mOutPixelsAllocation = Allocation.createFromBitmap(mRS, outb); + createTest(act.getResources()); } -- cgit v1.2.3-59-g8ed1b