From e6a7886674c167b4e17f6dc72d41d5b9c604cdd1 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Mon, 15 Oct 2012 15:45:12 -0700 Subject: [PATCH] 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 --- graphics/java/android/renderscript/ScriptIntrinsicBlur.java | 2 +- graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | 2 +- graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java | 2 +- graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java index 2a04b42a1b37..11164e3f020d 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 d7e9f32ca2f5..91efa02167fa 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 ff31270a810e..1f52e3fdf975 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 415061cd182c..dc8a5aa4dc9d 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); } /** -- 2.11.0