Update CTS tests for new RS constructor.
64-bit RS requires the new constructor because it doesn't use
resources anymore.
bug 16031597
Change-Id: I6e2e4c025b1bfd989b7e5496662cf7459eabf93c
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
index c4ea6d2..978dc0b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
@@ -58,7 +58,7 @@
Allocation given, int offset, int stride, int width, int height,
RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
if (mScript == null) {
- mScript = new ScriptC_ExactComparer(renderScript, resources, R.raw.exactcomparer);
+ mScript = new ScriptC_ExactComparer(renderScript);
}
mScript.set_WIDTH(width);
mScript.set_OFFSET(offset);
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
index 28e62ee..e766f63 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
@@ -88,8 +88,7 @@
Allocation given, int offset, int stride, int width, int height,
RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
if (mScript == null) {
- mScript = new ScriptC_MSSIMComparer(renderScript, resources,
- R.raw.mssimcomparer);
+ mScript = new ScriptC_MSSIMComparer(renderScript);
}
mScript.set_WIDTH(width);
mScript.set_HEIGHT(height);
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java
index ae826d3..cc2fbba 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java
@@ -53,8 +53,7 @@
Allocation given, int offset, int stride, int width, int height,
RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
if (mScript == null) {
- mScript = new ScriptC_MeanSquaredComparer(renderScript, resources,
- R.raw.meansquaredcomparer);
+ mScript = new ScriptC_MeanSquaredComparer(renderScript);
}
mScript.set_WIDTH(width);
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java
index 835798c..f8304ba 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java
@@ -69,8 +69,7 @@
Allocation given, int offset, int stride, int width, int height,
RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
if (mScript == null) {
- mScript = new ScriptC_ThresholdDifferenceComparer(renderScript, resources,
- R.raw.thresholddifferencecomparer);
+ mScript = new ScriptC_ThresholdDifferenceComparer(renderScript);
}
mScript.set_THRESHOLD(mThreshold);
