Merge "Fix bugs in scriptGroup." into jb-mr1-dev

Jason Sams · Android (Google) Code Review · commit 009d5413b273 · 2012-10-16T10:50:19.000-07:00
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
@@ -63,7 +63,7 @@ public static ScriptIntrinsicBlur create(RenderScript rs, Element e) {
      */
     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
@@ -68,7 +68,7 @@ public static ScriptIntrinsicConvolve3x3 create(RenderScript rs, Element e) {
      */
     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
@@ -61,7 +61,7 @@ public static ScriptIntrinsicConvolve5x5 create(RenderScript rs, Element e) {
      */
     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
@@ -56,7 +56,7 @@ public static ScriptIntrinsicYuvToRGB create(RenderScript rs, Element e) {
      */
     public void setInput(Allocation ain) {
         mInput = ain;
-        bindAllocation(ain, 0);
+        setVar(0, ain);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static ScriptIntrinsicBlur create(RenderScript rs, Element e) {`
`63`	`63`	`*/`
`64`	`64`	`public void setInput(Allocation ain) {`
`65`	`65`	`mInput = ain;`
`66`		`- bindAllocation(ain, 1);`
	`66`	`+ setVar(1, ain);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static ScriptIntrinsicConvolve3x3 create(RenderScript rs, Element e) {`
`68`	`68`	`*/`
`69`	`69`	`public void setInput(Allocation ain) {`
`70`	`70`	`mInput = ain;`
`71`		`- bindAllocation(ain, 1);`
	`71`	`+ setVar(1, ain);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static ScriptIntrinsicConvolve5x5 create(RenderScript rs, Element e) {`
`61`	`61`	`*/`
`62`	`62`	`public void setInput(Allocation ain) {`
`63`	`63`	`mInput = ain;`
`64`		`- bindAllocation(ain, 1);`
	`64`	`+ setVar(1, ain);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public static ScriptIntrinsicYuvToRGB create(RenderScript rs, Element e) {`
`56`	`56`	`*/`
`57`	`57`	`public void setInput(Allocation ain) {`
`58`	`58`	`mInput = ain;`
`59`		`- bindAllocation(ain, 0);`
	`59`	`+ setVar(0, ain);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`