diff options
author | Yang Ni <yangni@google.com> | 2015-04-07 00:06:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 00:06:34 +0000 |
commit | a9d76d153df39aa82be8c24033eebd8450e932e7 (patch) | |
tree | db8bd6e79d11e2b805e1d0c2c3af6fc34f6cea55 /rs/java/android/renderscript/ScriptGroup2.java | |
parent | 91d4c1d97ad730c4a447a6c984d514cdbba1e4c6 (diff) | |
parent | 249968b421a8dcfe5a26ec7f524e76295ec5eef5 (diff) |
am 249968b4: am 6bef5eb4: am 6422ee71: Merge "Rewrote FieldPack::createFieldPack for alignment"
* commit '249968b421a8dcfe5a26ec7f524e76295ec5eef5':
Rewrote FieldPack::createFieldPack for alignment
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup2.java')
-rw-r--r-- | rs/java/android/renderscript/ScriptGroup2.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup2.java b/rs/java/android/renderscript/ScriptGroup2.java index 9d73ac44ab5d..8b9f73eeb49b 100644 --- a/rs/java/android/renderscript/ScriptGroup2.java +++ b/rs/java/android/renderscript/ScriptGroup2.java @@ -126,7 +126,7 @@ public class ScriptGroup2 extends BaseObj { public Closure(RenderScript rs, Script.InvokeID invokeID, Object[] args, Map<Script.FieldID, Object> globals) { super(0, rs); - mFP = FieldPacker.createFieldPack(args); + mFP = FieldPacker.createFromArray(args); mArgs = args; mBindings = globals; |