Remove more pieces of setRoot. Add pointer to allocation lookup for scripts.
Change-Id: I2c3075d2056f02bb834bfad403dc72da991f3156
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 6796505..92ac573 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -138,7 +138,6 @@
native void nScriptSetClearDepth(int script, float depth);
native void nScriptSetClearStencil(int script, int stencil);
native void nScriptSetTimeZone(int script, byte[] timeZone);
- native void nScriptSetRoot(boolean isRoot);
native void nScriptInvoke(int id, int slot);
native void nScriptInvokeData(int id, int slot);
native void nScriptInvokeV(int id, int slot, byte[] params);
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java
index c1ba000..5959be4 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/graphics/java/android/renderscript/ScriptC.java
@@ -39,11 +39,11 @@
protected ScriptC(RenderScript rs, Resources resources, int resourceID, boolean isRoot) {
super(0, rs);
- mID = internalCreate(rs, resources, resourceID, isRoot);
+ mID = internalCreate(rs, resources, resourceID);
}
- private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID, boolean isRoot) {
+ private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID) {
byte[] pgm;
int pgmLength;
InputStream is = resources.openRawResource(resourceID);
@@ -74,7 +74,6 @@
rs.nScriptCBegin();
rs.nScriptCSetScript(pgm, 0, pgmLength);
- rs.nScriptSetRoot(isRoot);
return rs.nScriptCCreate();
}