summaryrefslogtreecommitdiffstats
path: root/tests/RenderScriptTests
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2012-08-21 17:08:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-21 17:08:17 -0700
commita8309cb7ee05502176c2715f381ea5e63016daae (patch)
tree98a86f40e0607f4345f34bc0fc63f5ed061fcacf /tests/RenderScriptTests
parent43c7aae4d0cf9e2d3527b093022ae1fa70d3920f (diff)
parent19e1086df11567be9ee3eaf99fa1fc82c65b2b27 (diff)
downloadframeworks_base-a8309cb7ee05502176c2715f381ea5e63016daae.zip
frameworks_base-a8309cb7ee05502176c2715f381ea5e63016daae.tar.gz
frameworks_base-a8309cb7ee05502176c2715f381ea5e63016daae.tar.bz2
Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev
Diffstat (limited to 'tests/RenderScriptTests')
-rw-r--r--tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Intrinsics.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Intrinsics.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Intrinsics.java
index ea8a018..dab8111 100644
--- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Intrinsics.java
+++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Intrinsics.java
@@ -46,7 +46,7 @@ public class Intrinsics extends TestBase {
v[0] = 0.f; v[1] = -s; v[2] = 0.f;
v[3] = -s; v[4] = s*4+1; v[5] = -s;
v[6] = 0.f; v[7] = -s; v[8] = 0.f;
- mScript.setValues(v);
+ mScript.setColorMatrix(v);
}
@@ -55,7 +55,8 @@ public class Intrinsics extends TestBase {
}
public void runTest() {
- mScript.forEach(mInPixelsAllocation, mOutPixelsAllocation);
+ mScript.setInput(mInPixelsAllocation);
+ mScript.forEach(mOutPixelsAllocation);
}
}