diff options
71 files changed, 89 insertions, 111 deletions
diff --git a/java/tests/ComputeBenchmark/src/com/example/android/rs/computebench/Benchmark.java b/java/tests/ComputeBenchmark/src/com/example/android/rs/computebench/Benchmark.java index ec80719e..9bb9b7e4 100644 --- a/java/tests/ComputeBenchmark/src/com/example/android/rs/computebench/Benchmark.java +++ b/java/tests/ComputeBenchmark/src/com/example/android/rs/computebench/Benchmark.java @@ -25,7 +25,7 @@ public class Benchmark implements Runnable { public Benchmark(RenderScript rs, Resources res) { mRS = rs; - mScript = new ScriptC_compute_benchmark(mRS, res, R.raw.compute_benchmark); + mScript = new ScriptC_compute_benchmark(mRS); } public void run() { diff --git a/java/tests/ComputePerf/src/com/example/android/rs/computeperf/LaunchTest.java b/java/tests/ComputePerf/src/com/example/android/rs/computeperf/LaunchTest.java index e2312ba9..8e73189e 100644 --- a/java/tests/ComputePerf/src/com/example/android/rs/computeperf/LaunchTest.java +++ b/java/tests/ComputePerf/src/com/example/android/rs/computeperf/LaunchTest.java @@ -28,8 +28,8 @@ public class LaunchTest { LaunchTest(RenderScript rs, Resources res) { mRS = rs; - mScript_xlw = new ScriptC_launchtestxlw(mRS, res, R.raw.launchtestxlw); - mScript_xyw = new ScriptC_launchtestxyw(mRS, res, R.raw.launchtestxyw); + mScript_xlw = new ScriptC_launchtestxlw(mRS); + mScript_xyw = new ScriptC_launchtestxyw(mRS); final int dim = mScript_xlw.get_dim(); mAllocationX = Allocation.createSized(rs, Element.U8(rs), dim); diff --git a/java/tests/ComputePerf/src/com/example/android/rs/computeperf/Mandelbrot.java b/java/tests/ComputePerf/src/com/example/android/rs/computeperf/Mandelbrot.java index ea1cd623..45cc7de9 100644 --- a/java/tests/ComputePerf/src/com/example/android/rs/computeperf/Mandelbrot.java +++ b/java/tests/ComputePerf/src/com/example/android/rs/computeperf/Mandelbrot.java @@ -26,7 +26,7 @@ public class Mandelbrot implements Runnable { Mandelbrot(RenderScript rs, Resources res) { mRS = rs; - mScript = new ScriptC_mandelbrot(mRS, res, R.raw.mandelbrot); + mScript = new ScriptC_mandelbrot(mRS); Type.Builder tb = new Type.Builder(rs, Element.U8_4(rs)); tb.setX(mScript.get_gDimX()); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Blur25.java b/java/tests/ImageProcessing/src/com/android/rs/image/Blur25.java index 0c6d41d8..ab98e938 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Blur25.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Blur25.java @@ -79,7 +79,7 @@ public class Blur25 extends TestBase { mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create()); mScratchPixelsAllocation2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_threshold(mRS, res, R.raw.threshold); + mScript = new ScriptC_threshold(mRS); mScript.set_width(width); mScript.set_height(height); mScript.invoke_setRadius(MAX_RADIUS); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/ColorCube.java b/java/tests/ImageProcessing/src/com/android/rs/image/ColorCube.java index d7f58c7b..e0942a50 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/ColorCube.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/ColorCube.java @@ -68,7 +68,7 @@ public class ColorCube extends TestBase { } public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_colorcube(mRS, res, R.raw.colorcube); + mScript = new ScriptC_colorcube(mRS); mIntrinsic = ScriptIntrinsic3DLUT.create(mRS, Element.U8_4(mRS)); initCube(); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/ColorMatrix.java b/java/tests/ImageProcessing/src/com/android/rs/image/ColorMatrix.java index 4e8e06c1..cc8bf2d3 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/ColorMatrix.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/ColorMatrix.java @@ -53,7 +53,7 @@ public class ColorMatrix extends TestBase { mIntrinsic.setColorMatrix(m); } } else { - mScript = new ScriptC_colormatrix(mRS, res, R.raw.colormatrix); + mScript = new ScriptC_colormatrix(mRS); mScript.invoke_setMatrix(m); } } diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Convolve3x3.java b/java/tests/ImageProcessing/src/com/android/rs/image/Convolve3x3.java index 76706c95..c4f57624 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Convolve3x3.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Convolve3x3.java @@ -54,7 +54,7 @@ public class Convolve3x3 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_convolve3x3(mRS, res, R.raw.convolve3x3); + mScript = new ScriptC_convolve3x3(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Convolve5x5.java b/java/tests/ImageProcessing/src/com/android/rs/image/Convolve5x5.java index a0f4fd10..8fa4405a 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Convolve5x5.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Convolve5x5.java @@ -68,7 +68,7 @@ public class Convolve5x5 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_convolve5x5(mRS, res, R.raw.convolve5x5); + mScript = new ScriptC_convolve5x5(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Copy.java b/java/tests/ImageProcessing/src/com/android/rs/image/Copy.java index efca0b55..70af7437 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Copy.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Copy.java @@ -30,7 +30,7 @@ public class Copy extends TestBase { private ScriptC_copy mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_copy(mRS, res, R.raw.copy); + mScript = new ScriptC_copy(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Fisheye.java b/java/tests/ImageProcessing/src/com/android/rs/image/Fisheye.java index 81868b10..d45477c4 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Fisheye.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Fisheye.java @@ -98,24 +98,20 @@ public class Fisheye extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) { - mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS, - res, R.raw.fisheye_approx_relaxed); + mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS); mScript_approx_relaxed.set_in_alloc(mInPixelsAllocation); mScript_approx_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_approx_full = new ScriptC_fisheye_approx_full(mRS, res, - R.raw.fisheye_approx_full); + mScript_approx_full = new ScriptC_fisheye_approx_full(mRS); mScript_approx_full.set_in_alloc(mInPixelsAllocation); mScript_approx_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } } else if (relaxed) { - mScript_relaxed = new ScriptC_fisheye_relaxed(mRS, res, - R.raw.fisheye_relaxed); + mScript_relaxed = new ScriptC_fisheye_relaxed(mRS); mScript_relaxed.set_in_alloc(mInPixelsAllocation); mScript_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_full = new ScriptC_fisheye_full(mRS, res, - R.raw.fisheye_full); + mScript_full = new ScriptC_fisheye_full(mRS); mScript_full.set_in_alloc(mInPixelsAllocation); mScript_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Grain.java b/java/tests/ImageProcessing/src/com/android/rs/image/Grain.java index 8618cc8f..a12058ae 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Grain.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Grain.java @@ -76,7 +76,7 @@ public class Grain extends TestBase { mNoise = Allocation.createTyped(mRS, tb.create()); mNoise2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_grain(mRS, res, R.raw.grain); + mScript = new ScriptC_grain(mRS); mScript.set_gWMask(noiseW - 1); mScript.set_gHMask(noiseH - 1); mScript.set_gNoiseStrength(0.5f); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Greyscale.java b/java/tests/ImageProcessing/src/com/android/rs/image/Greyscale.java index 3db210a3..65955724 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Greyscale.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Greyscale.java @@ -30,7 +30,7 @@ public class Greyscale extends TestBase { private ScriptC_greyscale mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_greyscale(mRS, res, R.raw.greyscale); + mScript = new ScriptC_greyscale(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/LevelsV4.java b/java/tests/ImageProcessing/src/com/android/rs/image/LevelsV4.java index 98c6460e..4ad81a39 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/LevelsV4.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/LevelsV4.java @@ -141,8 +141,8 @@ public class LevelsV4 extends TestBase { } public void createTest(android.content.res.Resources res) { - mScriptR = new ScriptC_levels_relaxed(mRS, res, R.raw.levels_relaxed); - mScriptF = new ScriptC_levels_full(mRS, res, R.raw.levels_full); + mScriptR = new ScriptC_levels_relaxed(mRS); + mScriptF = new ScriptC_levels_full(mRS); setSaturation(); setLevels(); } diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Mandelbrot.java b/java/tests/ImageProcessing/src/com/android/rs/image/Mandelbrot.java index f84dcb9d..6b8a0bc7 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Mandelbrot.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Mandelbrot.java @@ -88,7 +88,7 @@ public class Mandelbrot extends TestBase { int width = mOutPixelsAllocation.getType().getX(); int height = mOutPixelsAllocation.getType().getY(); - mScript = new ScriptC_mandelbrot(mRS, res, R.raw.mandelbrot); + mScript = new ScriptC_mandelbrot(mRS); mScript.set_gDimX(width); mScript.set_gDimY(height); mScript.set_gMaxIteration(50); diff --git a/java/tests/ImageProcessing/src/com/android/rs/image/Vignette.java b/java/tests/ImageProcessing/src/com/android/rs/image/Vignette.java index 18d11039..cc01bc2b 100644 --- a/java/tests/ImageProcessing/src/com/android/rs/image/Vignette.java +++ b/java/tests/ImageProcessing/src/com/android/rs/image/Vignette.java @@ -120,17 +120,13 @@ public class Vignette extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) - mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed( - mRS, res, R.raw.vignette_approx_relaxed); + mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed(mRS); else - mScript_approx_full = new ScriptC_vignette_approx_full( - mRS, res, R.raw.vignette_approx_full); + mScript_approx_full = new ScriptC_vignette_approx_full(mRS); } else if (relaxed) - mScript_relaxed = new ScriptC_vignette_relaxed(mRS, res, - R.raw.vignette_relaxed); + mScript_relaxed = new ScriptC_vignette_relaxed(mRS); else - mScript_full = new ScriptC_vignette_full(mRS, res, - R.raw.vignette_full); + mScript_full = new ScriptC_vignette_full(mRS); do_init(); } diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Blur25.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Blur25.java index b518b02e..fb5db180 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Blur25.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Blur25.java @@ -75,7 +75,7 @@ public class Blur25 extends TestBase { mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create()); mScratchPixelsAllocation2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_threshold(mRS, res, R.raw.threshold); + mScript = new ScriptC_threshold(mRS); mScript.set_width(width); mScript.set_height(height); mScript.invoke_setRadius(MAX_RADIUS); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/ColorCube.java b/java/tests/ImageProcessing2/src/com/android/rs/image/ColorCube.java index e9603851..49181f11 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/ColorCube.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/ColorCube.java @@ -60,7 +60,7 @@ public class ColorCube extends TestBase { } public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_colorcube(mRS, res, R.raw.colorcube); + mScript = new ScriptC_colorcube(mRS); mIntrinsic = ScriptIntrinsic3DLUT.create(mRS, Element.U8_4(mRS)); initCube(); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/ColorMatrix.java b/java/tests/ImageProcessing2/src/com/android/rs/image/ColorMatrix.java index 3b0f86a8..9a43f03e 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/ColorMatrix.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/ColorMatrix.java @@ -46,7 +46,7 @@ public class ColorMatrix extends TestBase { mIntrinsic.setColorMatrix(m); } } else { - mScript = new ScriptC_colormatrix(mRS, res, R.raw.colormatrix); + mScript = new ScriptC_colormatrix(mRS); mScript.invoke_setMatrix(m); } } diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java index d4852f0b..32c5846b 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java @@ -47,7 +47,7 @@ public class Convolve3x3 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_ip2_convolve3x3(mRS, res, R.raw.ip2_convolve3x3); + mScript = new ScriptC_ip2_convolve3x3(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve5x5.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve5x5.java index d2da3c43..411e2a84 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve5x5.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Convolve5x5.java @@ -61,7 +61,7 @@ public class Convolve5x5 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_convolve5x5(mRS, res, R.raw.convolve5x5); + mScript = new ScriptC_convolve5x5(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Copy.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Copy.java index ef719070..a5d15e57 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Copy.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Copy.java @@ -25,7 +25,7 @@ public class Copy extends TestBase { private ScriptC_copy mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_copy(mRS, res, R.raw.copy); + mScript = new ScriptC_copy(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Fisheye.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Fisheye.java index 97beb886..80a2fb42 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Fisheye.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Fisheye.java @@ -95,24 +95,20 @@ public class Fisheye extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) { - mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS, - res, R.raw.fisheye_approx_relaxed); + mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS); mScript_approx_relaxed.set_in_alloc(mInPixelsAllocation); mScript_approx_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_approx_full = new ScriptC_fisheye_approx_full(mRS, res, - R.raw.fisheye_approx_full); + mScript_approx_full = new ScriptC_fisheye_approx_full(mRS); mScript_approx_full.set_in_alloc(mInPixelsAllocation); mScript_approx_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } } else if (relaxed) { - mScript_relaxed = new ScriptC_fisheye_relaxed(mRS, res, - R.raw.fisheye_relaxed); + mScript_relaxed = new ScriptC_fisheye_relaxed(mRS); mScript_relaxed.set_in_alloc(mInPixelsAllocation); mScript_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_full = new ScriptC_fisheye_full(mRS, res, - R.raw.fisheye_full); + mScript_full = new ScriptC_fisheye_full(mRS); mScript_full.set_in_alloc(mInPixelsAllocation); mScript_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Grain.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Grain.java index dfd3c320..4dac265a 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Grain.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Grain.java @@ -71,7 +71,7 @@ public class Grain extends TestBase { mNoise = Allocation.createTyped(mRS, tb.create()); mNoise2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_grain(mRS, res, R.raw.grain); + mScript = new ScriptC_grain(mRS); mScript.set_gWMask(noiseW - 1); mScript.set_gHMask(noiseH - 1); mScript.set_gNoiseStrength(0.5f); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Greyscale.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Greyscale.java index 5b16e244..5b9b2413 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Greyscale.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Greyscale.java @@ -22,7 +22,7 @@ public class Greyscale extends TestBase { private ScriptC_greyscale mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_greyscale(mRS, res, R.raw.greyscale); + mScript = new ScriptC_greyscale(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/LevelsV4.java b/java/tests/ImageProcessing2/src/com/android/rs/image/LevelsV4.java index fbe37276..199c5041 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/LevelsV4.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/LevelsV4.java @@ -135,8 +135,8 @@ public class LevelsV4 extends TestBase { } public void createTest(android.content.res.Resources res) { - mScriptR = new ScriptC_levels_relaxed(mRS, res, R.raw.levels_relaxed); - mScriptF = new ScriptC_levels_full(mRS, res, R.raw.levels_full); + mScriptR = new ScriptC_levels_relaxed(mRS); + mScriptF = new ScriptC_levels_full(mRS); setSaturation(); setLevels(); } diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Mandelbrot.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Mandelbrot.java index 17805871..f957df45 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Mandelbrot.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Mandelbrot.java @@ -77,7 +77,7 @@ public class Mandelbrot extends TestBase { int width = mOutPixelsAllocation.getType().getX(); int height = mOutPixelsAllocation.getType().getY(); - mScript = new ScriptC_mandelbrot(mRS, res, R.raw.mandelbrot); + mScript = new ScriptC_mandelbrot(mRS); mScript.set_gDimX(width); mScript.set_gDimY(height); mScript.set_gMaxIteration(50); diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java index 9f6d34d3..ea6da832 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java @@ -122,11 +122,9 @@ public class Vignette extends TestBase { mScript_approx_full = new ScriptC_vignette_approx_full( mRS, res, R.raw.vignette_approx_full); } else if (relaxed) - mScript_relaxed = new ScriptC_vignette_relaxed(mRS, res, - R.raw.vignette_relaxed); + mScript_relaxed = new ScriptC_vignette_relaxed(mRS); else - mScript_full = new ScriptC_vignette_full(mRS, res, - R.raw.vignette_full); + mScript_full = new ScriptC_vignette_full(mRS); do_init(); } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Blur25.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Blur25.java index 90acd003..6d71e9e7 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Blur25.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Blur25.java @@ -79,7 +79,7 @@ public class Blur25 extends TestBase { mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create()); mScratchPixelsAllocation2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_threshold(mRS, res, R.raw.threshold); + mScript = new ScriptC_threshold(mRS); mScript.set_width(width); mScript.set_height(height); mScript.invoke_setRadius(MAX_RADIUS); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorCube.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorCube.java index 0153f407..d00fcb66 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorCube.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorCube.java @@ -68,7 +68,7 @@ public class ColorCube extends TestBase { } public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_colorcube(mRS, res, R.raw.colorcube); + mScript = new ScriptC_colorcube(mRS); mIntrinsic = ScriptIntrinsic3DLUT.create(mRS, Element.U8_4(mRS)); initCube(); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorMatrix.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorMatrix.java index a3823b60..e60fee69 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorMatrix.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/ColorMatrix.java @@ -53,7 +53,7 @@ public class ColorMatrix extends TestBase { mIntrinsic.setColorMatrix(m); } } else { - mScript = new ScriptC_colormatrix(mRS, res, R.raw.colormatrix); + mScript = new ScriptC_colormatrix(mRS); mScript.invoke_setMatrix(m); } } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve3x3.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve3x3.java index f70f7b46..7d9ad35e 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve3x3.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve3x3.java @@ -54,7 +54,7 @@ public class Convolve3x3 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_convolve3x3(mRS, res, R.raw.convolve3x3); + mScript = new ScriptC_convolve3x3(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve5x5.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve5x5.java index c3320742..6b0ef8c1 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve5x5.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Convolve5x5.java @@ -68,7 +68,7 @@ public class Convolve5x5 extends TestBase { mIntrinsic.setCoefficients(f); mIntrinsic.setInput(mInPixelsAllocation); } else { - mScript = new ScriptC_convolve5x5(mRS, res, R.raw.convolve5x5); + mScript = new ScriptC_convolve5x5(mRS); mScript.set_gCoeffs(f); mScript.set_gIn(mInPixelsAllocation); mScript.set_gWidth(mWidth); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Copy.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Copy.java index 1bdee4b3..38d0e650 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Copy.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Copy.java @@ -30,7 +30,7 @@ public class Copy extends TestBase { private ScriptC_copy mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_copy(mRS, res, R.raw.copy); + mScript = new ScriptC_copy(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Fisheye.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Fisheye.java index 114839c9..012c60db 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Fisheye.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Fisheye.java @@ -98,24 +98,20 @@ public class Fisheye extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) { - mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS, - res, R.raw.fisheye_approx_relaxed); + mScript_approx_relaxed = new ScriptC_fisheye_approx_relaxed(mRS); mScript_approx_relaxed.set_in_alloc(mInPixelsAllocation); mScript_approx_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_approx_full = new ScriptC_fisheye_approx_full(mRS, res, - R.raw.fisheye_approx_full); + mScript_approx_full = new ScriptC_fisheye_approx_full(mRS); mScript_approx_full.set_in_alloc(mInPixelsAllocation); mScript_approx_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } } else if (relaxed) { - mScript_relaxed = new ScriptC_fisheye_relaxed(mRS, res, - R.raw.fisheye_relaxed); + mScript_relaxed = new ScriptC_fisheye_relaxed(mRS); mScript_relaxed.set_in_alloc(mInPixelsAllocation); mScript_relaxed.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } else { - mScript_full = new ScriptC_fisheye_full(mRS, res, - R.raw.fisheye_full); + mScript_full = new ScriptC_fisheye_full(mRS); mScript_full.set_in_alloc(mInPixelsAllocation); mScript_full.set_sampler(Sampler.CLAMP_LINEAR(mRS)); } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Grain.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Grain.java index 5cd19a29..31e5f79f 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Grain.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Grain.java @@ -76,7 +76,7 @@ public class Grain extends TestBase { mNoise = Allocation.createTyped(mRS, tb.create()); mNoise2 = Allocation.createTyped(mRS, tb.create()); - mScript = new ScriptC_grain(mRS, res, R.raw.grain); + mScript = new ScriptC_grain(mRS); mScript.set_gWMask(noiseW - 1); mScript.set_gHMask(noiseH - 1); mScript.set_gNoiseStrength(0.5f); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Greyscale.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Greyscale.java index f1952e70..501492ae 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Greyscale.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Greyscale.java @@ -30,7 +30,7 @@ public class Greyscale extends TestBase { private ScriptC_greyscale mScript; public void createTest(android.content.res.Resources res) { - mScript = new ScriptC_greyscale(mRS, res, R.raw.greyscale); + mScript = new ScriptC_greyscale(mRS); } public void runTest() { diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/LevelsV4.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/LevelsV4.java index ba08b54b..38298438 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/LevelsV4.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/LevelsV4.java @@ -141,8 +141,8 @@ public class LevelsV4 extends TestBase { } public void createTest(android.content.res.Resources res) { - mScriptR = new ScriptC_levels_relaxed(mRS, res, R.raw.levels_relaxed); - mScriptF = new ScriptC_levels_full(mRS, res, R.raw.levels_full); + mScriptR = new ScriptC_levels_relaxed(mRS); + mScriptF = new ScriptC_levels_full(mRS); setSaturation(); setLevels(); } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Mandelbrot.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Mandelbrot.java index 26134b11..0b53ddfc 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Mandelbrot.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Mandelbrot.java @@ -88,7 +88,7 @@ public class Mandelbrot extends TestBase { int width = mOutPixelsAllocation.getType().getX(); int height = mOutPixelsAllocation.getType().getY(); - mScript = new ScriptC_mandelbrot(mRS, res, R.raw.mandelbrot); + mScript = new ScriptC_mandelbrot(mRS); mScript.set_gDimX(width); mScript.set_gDimY(height); mScript.set_gMaxIteration(50); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java index 94517575..3f860fb1 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java @@ -126,11 +126,9 @@ public class Vignette extends TestBase { mScript_approx_full = new ScriptC_vignette_approx_full( mRS, res, R.raw.vignette_approx_full); } else if (relaxed) - mScript_relaxed = new ScriptC_vignette_relaxed(mRS, res, - R.raw.vignette_relaxed); + mScript_relaxed = new ScriptC_vignette_relaxed(mRS); else - mScript_full = new ScriptC_vignette_full(mRS, res, - R.raw.vignette_full); + mScript_full = new ScriptC_vignette_full(mRS); do_init(); } diff --git a/java/tests/LatencyBenchmark/src/com/example/android/rs/computebench/Benchmark.java b/java/tests/LatencyBenchmark/src/com/example/android/rs/computebench/Benchmark.java index ee14fb99..4413114b 100644 --- a/java/tests/LatencyBenchmark/src/com/example/android/rs/computebench/Benchmark.java +++ b/java/tests/LatencyBenchmark/src/com/example/android/rs/computebench/Benchmark.java @@ -27,7 +27,7 @@ public class Benchmark implements Runnable { public Benchmark(RenderScript rs, Resources res) { mRS = rs; - mScript = new ScriptC_compute_benchmark(mRS, res, R.raw.compute_benchmark); + mScript = new ScriptC_compute_benchmark(mRS); ain = Allocation.createSized(rs, Element.U32(mRS), 10000); aout = Allocation.createSized(rs, Element.U32(mRS), 10000); } diff --git a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_bug_char.java b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_bug_char.java index 5da52883..fb11d49a 100644 --- a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_bug_char.java +++ b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_bug_char.java @@ -77,8 +77,7 @@ public class UT_bug_char extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_bug_char s = new ScriptC_bug_char(pRS, mRes, - R.raw.bug_char); + ScriptC_bug_char s = new ScriptC_bug_char(pRS); pRS.setMessageHandler(mRsMessage); initializeValues(s); s.invoke_bug_char_test(); diff --git a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_int4.java b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_int4.java index 95927984..0d1ca9d4 100644 --- a/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_int4.java +++ b/java/tests/RSTest_CompatLib/src/com/android/rs/test/UT_int4.java @@ -30,7 +30,7 @@ public class UT_int4 extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_int4 s = new ScriptC_int4(pRS, mRes, R.raw.int4); + ScriptC_int4 s = new ScriptC_int4(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_int4_test(); pRS.finish(); diff --git a/java/tests/RsTest/src/com/android/rs/test/RSTestCore.java b/java/tests/RsTest/src/com/android/rs/test/RSTestCore.java index d5f56b32..34b6938b 100644 --- a/java/tests/RsTest/src/com/android/rs/test/RSTestCore.java +++ b/java/tests/RsTest/src/com/android/rs/test/RSTestCore.java @@ -60,7 +60,7 @@ public class RSTestCore { mHeight = height; stopTesting = false; - mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist); + mScript = new ScriptC_rslist(mRS); unitTests = new ArrayList<UnitTest>(); diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_bug_char.java b/java/tests/RsTest/src/com/android/rs/test/UT_bug_char.java index faf3a315..87315255 100644 --- a/java/tests/RsTest/src/com/android/rs/test/UT_bug_char.java +++ b/java/tests/RsTest/src/com/android/rs/test/UT_bug_char.java @@ -77,8 +77,7 @@ public class UT_bug_char extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_bug_char s = new ScriptC_bug_char(pRS, mRes, - R.raw.bug_char); + ScriptC_bug_char s = new ScriptC_bug_char(pRS); pRS.setMessageHandler(mRsMessage); initializeValues(s); s.invoke_bug_char_test(); diff --git a/java/tests/RsTest/src/com/android/rs/test/UT_int4.java b/java/tests/RsTest/src/com/android/rs/test/UT_int4.java index 89a2a712..89c4c7ff 100644 --- a/java/tests/RsTest/src/com/android/rs/test/UT_int4.java +++ b/java/tests/RsTest/src/com/android/rs/test/UT_int4.java @@ -30,7 +30,7 @@ public class UT_int4 extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_int4 s = new ScriptC_int4(pRS, mRes, R.raw.int4); + ScriptC_int4 s = new ScriptC_int4(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_int4_test(); pRS.finish(); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/RSTestCore.java b/java/tests/RsTest_11/src/com/android/rs/test/RSTestCore.java index 888cfe4c..191cd87c 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/RSTestCore.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/RSTestCore.java @@ -60,7 +60,7 @@ public class RSTestCore { mHeight = height; stopTesting = false; - mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist); + mScript = new ScriptC_rslist(mRS); unitTests = new ArrayList<UnitTest>(); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_fp_mad.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_fp_mad.java index 5d72aa6e..e58c4232 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_fp_mad.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_fp_mad.java @@ -30,7 +30,7 @@ public class UT_fp_mad extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_fp_mad s = new ScriptC_fp_mad(pRS, mRes, R.raw.fp_mad); + ScriptC_fp_mad s = new ScriptC_fp_mad(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_fp_mad_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_math.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_math.java index 7e356f82..e6301229 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_math.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_math.java @@ -30,7 +30,7 @@ public class UT_math extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_math s = new ScriptC_math(pRS, mRes, R.raw.math); + ScriptC_math s = new ScriptC_math(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_math_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_primitives.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_primitives.java index dc3efbc7..463ae9b0 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_primitives.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_primitives.java @@ -89,7 +89,7 @@ public class UT_primitives extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_primitives s = new ScriptC_primitives(pRS, mRes, R.raw.primitives); + ScriptC_primitives s = new ScriptC_primitives(pRS); pRS.setMessageHandler(mRsMessage); if (!initializeGlobals(s)) { // initializeGlobals failed diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_rsdebug.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_rsdebug.java index 00dbaf5d..d506fd98 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_rsdebug.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_rsdebug.java @@ -30,7 +30,7 @@ public class UT_rsdebug extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rsdebug s = new ScriptC_rsdebug(pRS, mRes, R.raw.rsdebug); + ScriptC_rsdebug s = new ScriptC_rsdebug(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rsdebug(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_rstime.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_rstime.java index f75d3403..c8c63138 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_rstime.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_rstime.java @@ -30,7 +30,7 @@ public class UT_rstime extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstime s = new ScriptC_rstime(pRS, mRes, R.raw.rstime); + ScriptC_rstime s = new ScriptC_rstime(pRS); pRS.setMessageHandler(mRsMessage); s.setTimeZone("America/Los_Angeles"); s.invoke_test_rstime(0, 0); diff --git a/java/tests/RsTest_11/src/com/android/rs/test/UT_rstypes.java b/java/tests/RsTest_11/src/com/android/rs/test/UT_rstypes.java index 72a97c9d..b686a98d 100644 --- a/java/tests/RsTest_11/src/com/android/rs/test/UT_rstypes.java +++ b/java/tests/RsTest_11/src/com/android/rs/test/UT_rstypes.java @@ -30,7 +30,7 @@ public class UT_rstypes extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstypes s = new ScriptC_rstypes(pRS, mRes, R.raw.rstypes); + ScriptC_rstypes s = new ScriptC_rstypes(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rstypes(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/RSTestCore.java b/java/tests/RsTest_14/src/com/android/rs/test/RSTestCore.java index f1e81a45..3ef070ed 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/RSTestCore.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/RSTestCore.java @@ -60,7 +60,7 @@ public class RSTestCore { mHeight = height; stopTesting = false; - mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist); + mScript = new ScriptC_rslist(mRS); unitTests = new ArrayList<UnitTest>(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_fp_mad.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_fp_mad.java index 239496a1..aeb47411 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_fp_mad.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_fp_mad.java @@ -30,7 +30,7 @@ public class UT_fp_mad extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_fp_mad s = new ScriptC_fp_mad(pRS, mRes, R.raw.fp_mad); + ScriptC_fp_mad s = new ScriptC_fp_mad(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_fp_mad_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_math.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_math.java index 7b135c49..ad8cb766 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_math.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_math.java @@ -30,7 +30,7 @@ public class UT_math extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_math s = new ScriptC_math(pRS, mRes, R.raw.math); + ScriptC_math s = new ScriptC_math(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_math_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_primitives.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_primitives.java index d3c56f32..8f9e6528 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_primitives.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_primitives.java @@ -89,7 +89,7 @@ public class UT_primitives extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_primitives s = new ScriptC_primitives(pRS, mRes, R.raw.primitives); + ScriptC_primitives s = new ScriptC_primitives(pRS); pRS.setMessageHandler(mRsMessage); if (!initializeGlobals(s)) { // initializeGlobals failed diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_refcount.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_refcount.java index 05a516bd..aa67ef8e 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_refcount.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_refcount.java @@ -40,7 +40,7 @@ public class UT_refcount extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); pRS.setMessageHandler(mRsMessage); - ScriptC_refcount s = new ScriptC_refcount(pRS, mRes, R.raw.refcount); + ScriptC_refcount s = new ScriptC_refcount(pRS); initializeGlobals(pRS, s); s.invoke_refcount_test(); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_rsdebug.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_rsdebug.java index 95e92ee8..2f271eab 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_rsdebug.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_rsdebug.java @@ -30,7 +30,7 @@ public class UT_rsdebug extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rsdebug s = new ScriptC_rsdebug(pRS, mRes, R.raw.rsdebug); + ScriptC_rsdebug s = new ScriptC_rsdebug(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rsdebug(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_rstime.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_rstime.java index 283d94b3..514b6d88 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_rstime.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_rstime.java @@ -30,7 +30,7 @@ public class UT_rstime extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstime s = new ScriptC_rstime(pRS, mRes, R.raw.rstime); + ScriptC_rstime s = new ScriptC_rstime(pRS); pRS.setMessageHandler(mRsMessage); s.setTimeZone("America/Los_Angeles"); s.invoke_test_rstime(0, 0); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_rstypes.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_rstypes.java index ab968675..e426e729 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_rstypes.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_rstypes.java @@ -30,7 +30,7 @@ public class UT_rstypes extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstypes s = new ScriptC_rstypes(pRS, mRes, R.raw.rstypes); + ScriptC_rstypes s = new ScriptC_rstypes(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rstypes(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_14/src/com/android/rs/test/UT_vector.java b/java/tests/RsTest_14/src/com/android/rs/test/UT_vector.java index 657413e2..d94322f5 100644 --- a/java/tests/RsTest_14/src/com/android/rs/test/UT_vector.java +++ b/java/tests/RsTest_14/src/com/android/rs/test/UT_vector.java @@ -304,7 +304,7 @@ public class UT_vector extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_vector s = new ScriptC_vector(pRS, mRes, R.raw.vector); + ScriptC_vector s = new ScriptC_vector(pRS); pRS.setMessageHandler(mRsMessage); if (!initializeGlobals(s)) { result = -1; diff --git a/java/tests/RsTest_16/src/com/android/rs/test/RSTestCore.java b/java/tests/RsTest_16/src/com/android/rs/test/RSTestCore.java index 95d3c10f..20dafd59 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/RSTestCore.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/RSTestCore.java @@ -60,7 +60,7 @@ public class RSTestCore { mHeight = height; stopTesting = false; - mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist); + mScript = new ScriptC_rslist(mRS); unitTests = new ArrayList<UnitTest>(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_fp_mad.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_fp_mad.java index 1b46e133..75d6491c 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_fp_mad.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_fp_mad.java @@ -30,7 +30,7 @@ public class UT_fp_mad extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_fp_mad s = new ScriptC_fp_mad(pRS, mRes, R.raw.fp_mad); + ScriptC_fp_mad s = new ScriptC_fp_mad(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_fp_mad_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_math.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_math.java index 5a4d78c0..e0b296e8 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_math.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_math.java @@ -30,7 +30,7 @@ public class UT_math extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_math s = new ScriptC_math(pRS, mRes, R.raw.math); + ScriptC_math s = new ScriptC_math(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_math_test(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_primitives.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_primitives.java index 342f2a15..9a06170c 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_primitives.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_primitives.java @@ -89,7 +89,7 @@ public class UT_primitives extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_primitives s = new ScriptC_primitives(pRS, mRes, R.raw.primitives); + ScriptC_primitives s = new ScriptC_primitives(pRS); pRS.setMessageHandler(mRsMessage); if (!initializeGlobals(s)) { // initializeGlobals failed diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_refcount.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_refcount.java index 41ed1ffd..bc5aa11d 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_refcount.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_refcount.java @@ -40,7 +40,7 @@ public class UT_refcount extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); pRS.setMessageHandler(mRsMessage); - ScriptC_refcount s = new ScriptC_refcount(pRS, mRes, R.raw.refcount); + ScriptC_refcount s = new ScriptC_refcount(pRS); initializeGlobals(pRS, s); s.invoke_refcount_test(); pRS.finish(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_rsdebug.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_rsdebug.java index ed0a6d6f..ab24cb06 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_rsdebug.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_rsdebug.java @@ -30,7 +30,7 @@ public class UT_rsdebug extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rsdebug s = new ScriptC_rsdebug(pRS, mRes, R.raw.rsdebug); + ScriptC_rsdebug s = new ScriptC_rsdebug(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rsdebug(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_rstime.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_rstime.java index 9d2a668f..f8666e87 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_rstime.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_rstime.java @@ -30,7 +30,7 @@ public class UT_rstime extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstime s = new ScriptC_rstime(pRS, mRes, R.raw.rstime); + ScriptC_rstime s = new ScriptC_rstime(pRS); pRS.setMessageHandler(mRsMessage); s.setTimeZone("America/Los_Angeles"); s.invoke_test_rstime(0, 0); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_rstypes.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_rstypes.java index ee583b81..863eaab1 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_rstypes.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_rstypes.java @@ -30,7 +30,7 @@ public class UT_rstypes extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_rstypes s = new ScriptC_rstypes(pRS, mRes, R.raw.rstypes); + ScriptC_rstypes s = new ScriptC_rstypes(pRS); pRS.setMessageHandler(mRsMessage); s.invoke_test_rstypes(0, 0); pRS.finish(); diff --git a/java/tests/RsTest_16/src/com/android/rs/test/UT_vector.java b/java/tests/RsTest_16/src/com/android/rs/test/UT_vector.java index 015fc6c5..8545fefe 100644 --- a/java/tests/RsTest_16/src/com/android/rs/test/UT_vector.java +++ b/java/tests/RsTest_16/src/com/android/rs/test/UT_vector.java @@ -304,7 +304,7 @@ public class UT_vector extends UnitTest { public void run() { RenderScript pRS = RenderScript.create(mCtx); - ScriptC_vector s = new ScriptC_vector(pRS, mRes, R.raw.vector); + ScriptC_vector s = new ScriptC_vector(pRS); pRS.setMessageHandler(mRsMessage); if (!initializeGlobals(s)) { result = -1; diff --git a/java/tests/SampleTest/src/com/android/rs/sample/SampleRSActivity.java b/java/tests/SampleTest/src/com/android/rs/sample/SampleRSActivity.java index 84f3048d..95a28bba 100644 --- a/java/tests/SampleTest/src/com/android/rs/sample/SampleRSActivity.java +++ b/java/tests/SampleTest/src/com/android/rs/sample/SampleRSActivity.java @@ -138,7 +138,7 @@ public class SampleRSActivity extends Activity { displayView = (TextureView) findViewById(R.id.display4); displayView.setSurfaceTextureListener(updater); - mScript = new ScriptC_sample(mRS, getResources(), R.raw.sample); + mScript = new ScriptC_sample(mRS); } private Bitmap loadBitmap(int resource) { |