am 00cdb404: am 013a525c: am a1a18acd: Merge "Update RS sample apps to use the single argument Java constructor."

* commit '00cdb404a67b9a9f902950dd24475b2e20158758':
  Update RS sample apps to use the single argument Java constructor.

12 files changed, 17 insertions, 23 deletions

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();
     }