Revert "Add clipped kernel tests to CTS."
This reverts commit 1060c8d576edb86f9df1f3f3ec178a0a0100c1e6
Change-Id: I160a9561e52499bc53b645371729e8c9c1448bdf
diff --git a/tests/src/android/renderscript/cts/kernel_clip.rs b/tests/src/android/renderscript/cts/kernel_clip.rs
deleted file mode 100644
index 834bf33..0000000
--- a/tests/src/android/renderscript/cts/kernel_clip.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.renderscript.cts)
-
-int dimX;
-int dimY;
-int xStart = 0;
-int xEnd = 0;
-int yStart = 0;
-int yEnd = 0;
-
-rs_script s;
-rs_allocation ain;
-rs_allocation aout;
-
-void run_clipped_script() {
- rs_script_call_t rssc = {0};
- rssc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE;
- rssc.xStart = xStart;
- rssc.xEnd = xEnd;
- rssc.yStart = yStart;
- rssc.yEnd = yEnd;
-
- rsForEach(s, ain, aout, NULL, 0, &rssc);
-
-}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
index 26fe05f..fae20f4 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
@@ -50,8 +50,6 @@
import android.renderscript.Type;
-import android.renderscript.Script;
-
import android.renderscript.ScriptGroup;
import android.renderscript.ScriptIntrinsicBlend;
@@ -78,29 +76,6 @@
a2 = Allocation.createTyped(mRS, t);
}
- protected void runClippedIntrinsic(Script s,
- Allocation ain,
- Allocation aout) {
- int xStart = 16;
- int xEnd = 127;
- int yStart = 48;
- int yEnd = 63;
-
- ScriptC_kernel_clip clip = new ScriptC_kernel_clip(mRS);
- clip.set_xStart(xStart);
- clip.set_xEnd(xEnd);
- clip.set_yStart(yStart);
- clip.set_yEnd(yEnd);
-
- clip.set_s(s);
- clip.set_ain(ain);
- clip.set_aout(aout);
-
- clip.invoke_run_clipped_script();
- mRS.finish();
-
- }
-
public void testBlur() {
ScriptIntrinsicBlur mBlur;
mBlur = ScriptIntrinsicBlur.create(mRS, Element.U8_4(mRS));
@@ -116,8 +91,6 @@
mBlur.setRadius(i);
mBlur.setInput(a1_copy);
- runClippedIntrinsic(mBlur, a1_copy, a2_copy);
-
mBlur.forEach(a2_copy);
// validate
@@ -209,8 +182,6 @@
a1_copy.copy2DRangeFrom(0, 0, a1.getType().getX(), a1.getType().getY(), a1, 0, 0);
a2_copy.copy2DRangeFrom(0, 0, a2.getType().getX(), a2.getType().getY(), a2, 0, 0);
- runClippedIntrinsic(mColorMatrix, a1_copy, a2_copy);
-
mColorMatrix.forEach(a1_copy, a2_copy);
//validate greyscale
@@ -222,8 +193,6 @@
a1_copy.copy2DRangeFrom(0, 0, a1.getType().getX(), a1.getType().getY(), a1, 0, 0);
a2_copy.copy2DRangeFrom(0, 0, a2.getType().getX(), a2.getType().getY(), a2, 0, 0);
- runClippedIntrinsic(mColorMatrix, a1_copy, a2_copy);
-
mColorMatrix.forEach(a1_copy, a2_copy);
//validate color matrix
@@ -249,9 +218,6 @@
mConvolve3x3.setCoefficients(f);
mConvolve3x3.setInput(a1_copy);
-
- runClippedIntrinsic(mConvolve3x3, a1_copy, a2_copy);
-
mConvolve3x3.forEach(a2_copy);
// validate
@@ -277,9 +243,6 @@
mConvolve5x5.setCoefficients(f);
mConvolve5x5.setInput(a1_copy);
-
- runClippedIntrinsic(mConvolve5x5, a1_copy, a2_copy);
-
mConvolve5x5.forEach(a2_copy);
// validate
@@ -323,8 +286,6 @@
mLUT.forEach(a1_copy, a2_copy);
- runClippedIntrinsic(mLUT, a1_copy, a2_copy);
-
// validate
}
