From 19e1086df11567be9ee3eaf99fa1fc82c65b2b27 Mon Sep 17 00:00:00 2001
From: Jason Sams <jsams@google.com>
Date: Tue, 21 Aug 2012 15:53:29 -0700
Subject: Move the kernel launch to specific intrinsic class.

This allows support of both input types. Kernel source
and global source.

Change-Id: Iea60bebd79c786795eae81c14cbec352b470a9c0
---
 graphics/java/android/renderscript/ScriptIntrinsic.java      |  4 ----
 .../android/renderscript/ScriptIntrinsicConvolve3x3.java     | 12 +++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'graphics/java/android')

diff --git a/graphics/java/android/renderscript/ScriptIntrinsic.java b/graphics/java/android/renderscript/ScriptIntrinsic.java
index 6ad1527d05af..f275fee1b891 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsic.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsic.java
@@ -28,8 +28,4 @@ public class ScriptIntrinsic extends Script {
     ScriptIntrinsic(int id, RenderScript rs) {
         super(id, rs);
     }
-
-    public void forEach(Allocation ain, Allocation aout) {
-        forEach(0, ain, aout, null);
-    }
 }
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
index 0ae144980062..c7465a7d522a 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
@@ -32,6 +32,7 @@ import java.util.HashMap;
  **/
 public class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
     private float[] mValues = new float[9];
+    private Allocation mInput;
 
     ScriptIntrinsicConvolve3x3(int id, RenderScript rs) {
         super(id, rs);
@@ -52,8 +53,12 @@ public class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
 
     }
 
+    public void setInput(Allocation ain) {
+        mInput = ain;
+        bindAllocation(ain, 1);
+    }
 
-    public void setValues(float v[]) {
+    public void setColorMatrix(float v[]) {
         FieldPacker fp = new FieldPacker(9*4);
         for (int ct=0; ct < mValues.length; ct++) {
             mValues[ct] = v[ct];
@@ -61,5 +66,10 @@ public class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
         }
         setVar(0, fp);
     }
+
+    public void forEach(Allocation aout) {
+        forEach(0, null, aout, null);
+    }
+
 }
 
-- 
cgit v1.2.3-59-g8ed1b