diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-06-11 12:01:28 -0700 |
|---|---|---|
| committer | Chris Wailes <chriswailes@google.com> | 2014-07-07 12:27:21 -0700 |
| commit | 949610653fdf55dd2cb3c846047e6aa2c6d73f0d (patch) | |
| tree | 3062df8ab3960637b2179d4caf688ca97228e627 /rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | |
| parent | ef2e76675a6c60a2a4764a2e19fdb2c4d9beb00e (diff) | |
Adds support for multi-input kernels to Frameworks/Base/RS.
* Added a new JNI call to pass arrays of Allocations to the RS runtime.
* Added a new version of ForEach that takes an array of Allocations.
* Added some casts to disambiguate existing calls to forEach.
Change-Id: I46d2834c37075b2a2407fd8b010546818a4540d1
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index 25f3ee877ae5..586930ce245a 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -108,7 +108,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { * type. */ public void forEach(Allocation aout) { - forEach(0, null, aout, null); + forEach(0, (Allocation) null, aout, null); } /** @@ -130,4 +130,3 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { } } - |