summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ScriptGroup2.java
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-04-02 17:47:56 -0700
committerYang Ni <yangni@google.com>2015-04-13 17:24:44 -0700
commit35be56cce821d86f69026398ff9433e2d173b02f (patch)
tree09e39a548309294db1e9470de38fbd9a65399262 /rs/java/android/renderscript/ScriptGroup2.java
parent3afca74a2a40b4e957630909fe5df76aa550da69 (diff)
Add name to ScriptGroup2.Builder.create() method
This name will be used to name the .so file generated for the script group with fused kernels. Change-Id: I46e351c8412740512f56b7915b14f36183c6eeaf
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup2.java')
-rw-r--r--rs/java/android/renderscript/ScriptGroup2.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup2.java b/rs/java/android/renderscript/ScriptGroup2.java
index 9b926115f29e..417bbee73019 100644
--- a/rs/java/android/renderscript/ScriptGroup2.java
+++ b/rs/java/android/renderscript/ScriptGroup2.java
@@ -289,6 +289,7 @@ public class ScriptGroup2 extends BaseObj {
}
}
+ String mName;
List<Closure> mClosures;
List<UnboundValue> mInputs;
Future[] mOutputs;
@@ -299,9 +300,10 @@ public class ScriptGroup2 extends BaseObj {
super(id, rs);
}
- ScriptGroup2(RenderScript rs, List<Closure> closures,
+ ScriptGroup2(RenderScript rs, String name, List<Closure> closures,
List<UnboundValue> inputs, Future[] outputs) {
super(0, rs);
+ mName = name;
mClosures = closures;
mInputs = inputs;
mOutputs = outputs;
@@ -310,7 +312,7 @@ public class ScriptGroup2 extends BaseObj {
for (int i = 0; i < closureIDs.length; i++) {
closureIDs[i] = closures.get(i).getID(rs);
}
- long id = rs.nScriptGroup2Create(ScriptC.mCachePath, closureIDs);
+ long id = rs.nScriptGroup2Create(name, ScriptC.mCachePath, closureIDs);
setID(id);
}
@@ -417,7 +419,7 @@ public class ScriptGroup2 extends BaseObj {
!name.equals(name.replaceAll("[^a-zA-Z0-9-]", "_"))) {
throw new RSIllegalArgumentException("invalid script group name");
}
- ScriptGroup2 ret = new ScriptGroup2(mRS, mClosures, mInputs, outputs);
+ ScriptGroup2 ret = new ScriptGroup2(mRS, name, mClosures, mInputs, outputs);
return ret;
}