From 73ae6d9f02ff0fc0b78fe4fed54ab63b932d58d7 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 15 Aug 2014 02:18:22 -0700 Subject: [PATCH] Fix RS samples to prepare for 64-bit compilation. Bug: 16031597 Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b (cherry picked from commit d8295c9e49a1449c2953089c30a234e57119c8e5) --- .../src/com/example/android/rs/hellocompute/HelloCompute.java | 2 +- .../Levels/src/com/android/rs/levels/LevelsRSActivity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/HelloCompute.java b/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/HelloCompute.java index 165682135..643df9b2a 100644 --- a/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/HelloCompute.java +++ b/samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/HelloCompute.java @@ -62,7 +62,7 @@ public class HelloCompute extends Activity { Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); - mScript = new ScriptC_mono(mRS, getResources(), R.raw.mono); + mScript = new ScriptC_mono(mRS); mScript.forEach_root(mInAllocation, mOutAllocation); mOutAllocation.copyTo(mBitmapOut); diff --git a/samples/RenderScript/Levels/src/com/android/rs/levels/LevelsRSActivity.java b/samples/RenderScript/Levels/src/com/android/rs/levels/LevelsRSActivity.java index f8bba2ebe..647196085 100644 --- a/samples/RenderScript/Levels/src/com/android/rs/levels/LevelsRSActivity.java +++ b/samples/RenderScript/Levels/src/com/android/rs/levels/LevelsRSActivity.java @@ -176,7 +176,7 @@ public class LevelsRSActivity extends Activity Allocation.USAGE_IO_OUTPUT); mDisplayView.setSurfaceTextureListener(this); - mScript = new ScriptC_levels(mRS, getResources(), R.raw.levels); + mScript = new ScriptC_levels(mRS); mScript.set_gamma(mGamma); setSaturation();