diff options
| author | Jason Sams <jsams@google.com> | 2012-10-15 15:45:12 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2012-10-15 15:52:22 -0700 |
| commit | e6a7886674c167b4e17f6dc72d41d5b9c604cdd1 (patch) | |
| tree | ba9051e07c9eb56420eb72f286b8a0842f6a0415 /graphics | |
| parent | 477687c1eb1919c54e2bffba2a740df3b4af6668 (diff) | |
| download | frameworks_base-e6a7886674c167b4e17f6dc72d41d5b9c604cdd1.zip frameworks_base-e6a7886674c167b4e17f6dc72d41d5b9c604cdd1.tar.gz frameworks_base-e6a7886674c167b4e17f6dc72d41d5b9c604cdd1.tar.bz2 | |
Fix bugs in scriptGroup.
Intrinsics were treating inputs as fields rather than varObjs.
This would generate a lot of extra work for the reflection
layers. Also we would like to deprecate this path in the future.
bug 7318821
Change-Id: I81e8c562ba05aae5d085d5c08e91e2c4877265c5
Diffstat (limited to 'graphics')
4 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java index 2a04b42..11164e3 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java @@ -63,7 +63,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { */ public void setInput(Allocation ain) { mInput = ain; - bindAllocation(ain, 1); + setVar(1, ain); } /** diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index d7e9f32..91efa02 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -68,7 +68,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { */ public void setInput(Allocation ain) { mInput = ain; - bindAllocation(ain, 1); + setVar(1, ain); } /** diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java index ff31270..1f52e3f 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java @@ -61,7 +61,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { */ public void setInput(Allocation ain) { mInput = ain; - bindAllocation(ain, 1); + setVar(1, ain); } /** diff --git a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java index 415061c..dc8a5aa 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java @@ -56,7 +56,7 @@ public final class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic { */ public void setInput(Allocation ain) { mInput = ain; - bindAllocation(ain, 0); + setVar(0, ain); } /** |