am 5e6281d6: Merge "Simplify RSUtils.java."
* commit '5e6281d6794eec14379068b287b002058b346222':
Simplify RSUtils.java.
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/AllocationResize.java b/tests/tests/renderscript/src/android/renderscript/cts/AllocationResize.java
index b6d9a1a..68d7274 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/AllocationResize.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/AllocationResize.java
@@ -49,7 +49,7 @@
mIn.copy1DRangeFrom(0, INPUTSIZE, inArray);
try {
- RSUtils.forEach(this, 0, mIn, mOut);
+ forEach(0, mIn, mOut);
} catch (RSRuntimeException e) {
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
index 64deb33..e8a330a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ClearObjectTest.java
@@ -66,7 +66,7 @@
Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
ms_clear.set_element(element);
try {
- RSUtils.forEach(this, TEST_ID_ELEMENT, mIn, mOut);
+ forEach(TEST_ID_ELEMENT, mIn, mOut);
} catch (RSRuntimeException e) {
}
int[] tmpArray = new int[ObjectNum];
@@ -83,7 +83,7 @@
ms_clear.set_type(type);
try {
- RSUtils.forEach(this, TEST_ID_TYPE, mIn, mOut);
+ forEach(TEST_ID_TYPE, mIn, mOut);
} catch (RSRuntimeException e) {
}
int[] tmpArray = new int[ObjectNum];
@@ -99,7 +99,7 @@
Allocation allocation = Allocation.createTyped(mRS, mIn.getType());
ms_clear.set_allocation(allocation);
try {
- RSUtils.forEach(this, TEST_ID_ALLOCATION, mIn, mOut);
+ forEach(TEST_ID_ALLOCATION, mIn, mOut);
} catch (RSRuntimeException e) {
}
int[] tmpArray = new int[ObjectNum];
@@ -115,7 +115,7 @@
Allocation mIn = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
ms_clear.set_sampler(sampler);
try {
- RSUtils.forEach(this, TEST_ID_SAMPLER, mIn, mOut);
+ forEach(TEST_ID_SAMPLER, mIn, mOut);
} catch (RSRuntimeException e) {
}
int[] tmpArray = new int[ObjectNum];
@@ -131,7 +131,7 @@
Allocation mOut = Allocation.createSized(mRS, Element.I32(mRS), ObjectNum);
ms_clear.set_script(script);
try {
- RSUtils.forEach(this, TEST_ID_SCRIPT, mIn, mOut);
+ forEach(TEST_ID_SCRIPT, mIn, mOut);
} catch (RSRuntimeException e) {
}
int[] tmpArray = new int[ObjectNum];
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/GetElementAt.java b/tests/tests/renderscript/src/android/renderscript/cts/GetElementAt.java
index a9be1bc..babc1ef 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/GetElementAt.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/GetElementAt.java
@@ -62,7 +62,7 @@
mOut = Allocation.createTyped(mRS, gIn.getType());
script_x.set_gIn(gIn);
try {
- RSUtils.forEach(this, TEST_ID_X, mOut);
+ forEach(TEST_ID_X, mOut);
} catch (RSRuntimeException e) {
}
mOut.copyTo(out);
@@ -83,7 +83,7 @@
mOut = Allocation.createTyped(mRS, gIn.getType());
script_xy.set_gIn(gIn);
try {
- RSUtils.forEach(this, TEST_ID_XY, mOut);
+ forEach(TEST_ID_XY, mOut);
} catch (RSRuntimeException e) {
}
mOut.copyTo(out);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/InitTest.java b/tests/tests/renderscript/src/android/renderscript/cts/InitTest.java
index ef36927..848c192 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/InitTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/InitTest.java
@@ -46,7 +46,7 @@
mIn.copy1DRangeFrom(0, INPUTSIZE, in);
try {
- RSUtils.forEach(this, 0, mIn, mOut);
+ forEach(0, mIn, mOut);
} catch (RSRuntimeException e) {
}
mOut.copyTo(out);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
index 09a2e94..ad3d078 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PowTest.java
@@ -88,8 +88,8 @@
}
@Override
- protected void fillRandom(long seed, int fact, int offset, float[] inArray, int rStride, int rSkip) {
- RSUtils.genRandom(seed, 32, -16, inArray, rStride, rSkip);
+ protected void fillRandomFloats(long seed, int fact, int offset, float[] inArray) {
+ RSUtils.genRandomFloats(seed, 32, -16, inArray);
}
public void testPowF32() {
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
index c95a294..32308ce 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PownTest.java
@@ -82,7 +82,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
n = new int[INPUTSIZE];
- RSUtils.genRandom(0x12345678, 32, 1, -16, n);
+ RSUtils.genRandomInts(0x12345678, 32, -16, n);
nAlloc.copyFrom(n);
script_f32.set_n1(nAlloc);
@@ -93,7 +93,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
n = new int[INPUTSIZE];
- RSUtils.genRandom(0x12345678, 32, 1, -16, n);
+ RSUtils.genRandomInts(0x12345678, 32, -16, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n1(nAlloc);
@@ -104,7 +104,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
n = new int[INPUTSIZE*2];
- RSUtils.genRandom(0xacdef1, 32, 1, -16, n);
+ RSUtils.genRandomInts(0xacdef1, 32, -16, n);
nAlloc.copyFrom(n);
script_f32.set_n2(nAlloc);
@@ -115,7 +115,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
n = new int[INPUTSIZE*2];
- RSUtils.genRandom(0xacdef1, 32, 1, -16, n);
+ RSUtils.genRandomInts(0xacdef1, 32, -16, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n2(nAlloc);
@@ -126,7 +126,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0xa123f1, 32, 1, -16, n, 4, 1);
+ RSUtils.genRandomInts(0xa123f1, 32, -16, n);
nAlloc.copyFrom(n);
script_f32.set_n3(nAlloc);
@@ -137,7 +137,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0xa123f1, 32, 1, -16, n, 4, 1);
+ RSUtils.genRandomInts(0xa123f1, 32, -16, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n3(nAlloc);
@@ -148,7 +148,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0x4323ca, 32, 1, -16, n);
+ RSUtils.genRandomInts(0x4323ca, 32, -16, n);
nAlloc.copyFrom(n);
script_f32.set_n4(nAlloc);
@@ -159,7 +159,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0x4323ca, 32, 1, -16, n);
+ RSUtils.genRandomInts(0x4323ca, 32, -16, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n4(nAlloc);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java b/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
index f10995b..cebbe24 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/PowrTest.java
@@ -88,8 +88,8 @@
}
@Override
- protected void fillRandom(long seed, int fact, int offset, float[] inArray, int rStride, int rSkip) {
- RSUtils.genRandom(seed, 64, 0, inArray, rStride, rSkip);
+ protected void fillRandomFloats(long seed, int fact, int offset, float[] inArray) {
+ RSUtils.genRandomFloats(seed, 64, 0, inArray);
}
public void testPowrF32() {
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RSBaseCompute.java b/tests/tests/renderscript/src/android/renderscript/cts/RSBaseCompute.java
index d68e628..d7759f1 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RSBaseCompute.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RSBaseCompute.java
@@ -89,7 +89,7 @@
int offset, int rStride, int rSkip, int refStride, int outStride,
int inStride, int skip, int ulp) {
float[] inArray = makeInArray(INPUTSIZE * inStride);
- fillRandom(seed, fact, offset, inArray, rStride, rSkip);
+ fillRandomFloats(seed, fact, offset, inArray);
float[] refArray = getRefArray(inArray, INPUTSIZE, inStride, skip);
Allocation mAllocationIn = setInAlloc(inElement);
@@ -97,7 +97,7 @@
Allocation mAllocationOut = setOutAlloc(outElement);
try {
- RSUtils.forEach(this, testid, mAllocationIn, mAllocationOut);
+ forEach(testid, mAllocationIn, mAllocationOut);
} catch (RSRuntimeException e) {
Log.e("RenderscriptCTS", "Caught RSRuntimeException: " +
e.getMessage());
@@ -173,8 +173,8 @@
return new float[size];
}
- protected void fillRandom(long seed, int fact, int offset, float[] inArray, int rStride, int rSkip) {
- RSUtils.genRandom(seed, fact, offset, inArray, rStride, rSkip);
+ protected void fillRandomFloats(long seed, int fact, int offset, float[] inArray) {
+ RSUtils.genRandomFloats(seed, fact, offset, inArray);
}
protected void fillInAlloc(Allocation mIn, float[] inArray) {
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RSUtils.java b/tests/tests/renderscript/src/android/renderscript/cts/RSUtils.java
index 8c81e3d..d3fb5d0 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RSUtils.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RSUtils.java
@@ -27,65 +27,23 @@
*/
public class RSUtils {
- public static void genRandom(long seed, int factor, int offset, float array[]) {
+ /**
+ * Fills the array with random floats. Values will be: offset + number between 0 and max.
+ */
+ public static void genRandomFloats(long seed, int max, int offset, float array[]) {
Random r = new Random(seed);
for (int i = 0; i < array.length; i++) {
- array[i] = r.nextFloat() * factor + offset;
+ array[i] = r.nextFloat() * max + offset;
}
}
- public static void genRandom(long seed, int factor, int offset, float array[],
- int stride, int skip) {
- Random r = new Random(seed);
- for (int i = 0; i < array.length / stride; i++) {
- for (int j = 0; j < stride; j++) {
- if (j >= stride - skip)
- array[i * stride + j] = 0;
- else
- array[i * stride + j] = r.nextFloat() * factor + offset;
- }
- }
- }
-
- public static void genRandom(long seed, int max, int factor, int offset, int array[]) {
+ /**
+ * Fills the array with random ints. Values will be: offset + number between 0 and max (exclusive).
+ */
+ public static void genRandomInts(long seed, int max, int offset, int array[]) {
Random r = new Random(seed);
for (int i = 0; i < array.length; i++) {
- array[i] = (r.nextInt(max) * factor + offset);
+ array[i] = (r.nextInt(max) + offset);
}
}
-
- public static void genRandom(long seed, int factor, int offset, int array[],
- int stride, int skip) {
- Random r = new Random(seed);
- for (int i = 0; i < array.length / stride; i++) {
- for (int j = 0; j < stride; j++) {
- if (j >= stride - skip)
- array[i * stride + j] = 0;
- else
- array[i * stride + j] = r.nextInt() * factor + offset;
- }
- }
- }
-
- public static void genRandom(long seed, int max, int factor, int offset, int array[],
- int stride, int skip) {
- Random r = new Random(seed);
- for (int i = 0; i < array.length / stride; i++) {
- for (int j = 0; j < stride; j++) {
- if (j >= stride - skip)
- array[i * stride + j] = 0;
- else
- array[i * stride + j] = r.nextInt(max) * factor + offset;
- }
- }
- }
-
- public static void forEach(RSBaseCompute base, int testId, Allocation in) throws RSRuntimeException {
- base.forEach(testId, in);
- }
-
- public static void forEach(RSBaseCompute base, int testId, Allocation in, Allocation out)
- throws RSRuntimeException {
- base.forEach(testId, in,out);
- }
}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java b/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
index 8301ad5..2c447bb 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RootnTest.java
@@ -80,7 +80,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
n = new int[INPUTSIZE];
- RSUtils.genRandom(0x12345678, 32, 1, 1, n);
+ RSUtils.genRandomInts(0x12345678, 32, 1, n);
nAlloc.copyFrom(n);
script_f32.set_n1(nAlloc);
@@ -91,7 +91,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32(mRS), INPUTSIZE);
n = new int[INPUTSIZE];
- RSUtils.genRandom(0x12345678, 32, 1, 1, n);
+ RSUtils.genRandomInts(0x12345678, 32, 1, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n1(nAlloc);
@@ -103,7 +103,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
n = new int[INPUTSIZE*2];
- RSUtils.genRandom(0xacdef1, 32, 1, 1, n);
+ RSUtils.genRandomInts(0xacdef1, 32, 1, n);
nAlloc.copyFrom(n);
script_f32.set_n2(nAlloc);
@@ -114,7 +114,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_2(mRS), INPUTSIZE);
n = new int[INPUTSIZE*2];
- RSUtils.genRandom(0xacdef1, 32, 1, 1, n);
+ RSUtils.genRandomInts(0xacdef1, 32, 1, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n2(nAlloc);
@@ -126,7 +126,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0xa123f1, 32, 1, 1, n, 4, 1);
+ RSUtils.genRandomInts(0xa123f1, 32, 1, n);
nAlloc.copyFrom(n);
script_f32.set_n3(nAlloc);
@@ -137,7 +137,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_3(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0xa123f1, 32, 1, 1, n, 4, 1);
+ RSUtils.genRandomInts(0xa123f1, 32, 1, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n3(nAlloc);
@@ -148,7 +148,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0x4323ca, 32, 1, 1, n);
+ RSUtils.genRandomInts(0x4323ca, 32, 1, n);
nAlloc.copyFrom(n);
script_f32.set_n4(nAlloc);
@@ -159,7 +159,7 @@
Allocation nAlloc = Allocation.createSized(mRS, Element.I32_4(mRS), INPUTSIZE);
n = new int[INPUTSIZE*4];
- RSUtils.genRandom(0x4323ca, 32, 1, 1, n);
+ RSUtils.genRandomInts(0x4323ca, 32, 1, n);
nAlloc.copyFrom(n);
script_f32_relaxed.set_n4(nAlloc);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java b/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
index 0b008a7..edff5b9 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RsPackColorTo8888Test.java
@@ -72,10 +72,10 @@
float[] inArray = new float[INPUTSIZE * 4];
byte[] outArray = new byte[INPUTSIZE * 4];
byte[] refArray = new byte[INPUTSIZE * 4];
- RSUtils.genRandom(seed, 1, 0, inArray, 4, 1);
+ RSUtils.genRandomFloats(seed, 1, 0, inArray);
mAllocationIn.copy1DRangeFrom(0, INPUTSIZE, inArray);
try {
- RSUtils.forEach(this, testId, mAllocationIn, mAllocationOut);
+ forEach(testId, mAllocationIn, mAllocationOut);
} catch (RSRuntimeException e) {
}
mAllocationOut.copyTo(outArray);
@@ -99,10 +99,10 @@
float[] inArray = new float[INPUTSIZE * 4];
byte[] outArray = new byte[INPUTSIZE * 4];
byte[] refArray = new byte[INPUTSIZE * 4];
- RSUtils.genRandom(seed, 1, 0, inArray);
+ RSUtils.genRandomFloats(seed, 1, 0, inArray);
mAllocationIn.copy1DRangeFrom(0, INPUTSIZE, inArray);
try {
- RSUtils.forEach(this, testId, mAllocationIn, mAllocationOut);
+ forEach(testId, mAllocationIn, mAllocationOut);
} catch (RSRuntimeException e) {
}
mAllocationOut.copyTo(outArray);
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/RsUnpackColor8888Test.java b/tests/tests/renderscript/src/android/renderscript/cts/RsUnpackColor8888Test.java
index 4df1169..3ebbee1 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/RsUnpackColor8888Test.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/RsUnpackColor8888Test.java
@@ -44,7 +44,7 @@
mAllocationIn.copy1DRangeFrom(0, INPUTSIZE, inArray);
try {
- RSUtils.forEach(this, 0, mAllocationIn, mAllocationOut);
+ forEach(0, mAllocationIn, mAllocationOut);
} catch (RSRuntimeException e) {
}
mAllocationOut.copyTo(outArray);