From adeb809201fcb77ba2b76a814ae4cdc9dacb326b Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 20 Apr 2012 14:26:06 -0700 Subject: Start passing element/dim information along with FieldPacker. BUG=6009244 Change-Id: I3c82c8b40c899b875831f53cf0ad82ea36c1a043 --- graphics/java/android/renderscript/RenderScript.java | 7 +++++++ graphics/java/android/renderscript/Script.java | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 9a5b3493c39f..46ad495eaba9 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -541,6 +541,13 @@ public class RenderScript { validate(); rsnScriptSetVarV(mContext, id, slot, val); } + native void rsnScriptSetVarVE(int con, int id, int slot, byte[] val, + int e, int[] dims); + synchronized void nScriptSetVarVE(int id, int slot, byte[] val, + int e, int[] dims) { + validate(); + rsnScriptSetVarVE(mContext, id, slot, val, e, dims); + } native void rsnScriptSetVarObj(int con, int id, int slot, int val); synchronized void nScriptSetVarObj(int id, int slot, int val) { validate(); diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java index 34d33a95db93..56893ac4a6bc 100644 --- a/graphics/java/android/renderscript/Script.java +++ b/graphics/java/android/renderscript/Script.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2008-2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,6 +162,18 @@ public class Script extends BaseObj { mRS.nScriptSetVarV(getID(mRS), index, v.getData()); } + /** @deprecated renderscript is deprecated in J + * Only intended for use by generated reflected code. + * + * @param index + * @param v + * @param e + * @param dims + */ + public void setVar(int index, FieldPacker v, Element e, int[] dims) { + mRS.nScriptSetVarVE(getID(mRS), index, v.getData(), e.getID(mRS), dims); + } + /** @deprecated renderscript is deprecated in J */ public void setTimeZone(String timeZone) { -- cgit v1.2.3-59-g8ed1b