Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert Java/JNI to 64-bit, part 2.

Browse Source 
This changes BaseObj to support 64-bit IDs. There are a few caveats:

1. Since it is deprecated, RSG will not support 64-bit.
2. Currently, methods that pass arrays of IDs to the driver are not supported in 64-bit. This will be fixed in a later CL.

bug 11332320

Change-Id: If0dbecc8b285e260f767e441e05088b6a1b749a2
This commit is contained in:
Tim Murray
2013-11-19 12:45:54 -08:00
parent eff663f391
commit 460a04971c
30 changed files with 485 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/java/android/renderscript/Script.java
View File

@@ -36,7 +36,7 @@ public class Script extends BaseObj {
Script mScript;
int mSlot;
int mSig;
KernelID(int id, RenderScript rs, Script s, int slot, int sig) {
KernelID(long id, RenderScript rs, Script s, int slot, int sig) {
super(id, rs);
mScript = s;
mSlot = slot;
@@ -54,7 +54,7 @@ public class Script extends BaseObj {
return k;
}
int id = mRS.nScriptKernelIDCreate(getID(mRS), slot, sig);
long id = mRS.nScriptKernelIDCreate(getID(mRS), slot, sig);
if (id == 0) {
throw new RSDriverException("Failed to create KernelID");
}
@@ -75,7 +75,7 @@ public class Script extends BaseObj {
public static final class FieldID extends BaseObj {
Script mScript;
int mSlot;
FieldID(int id, RenderScript rs, Script s, int slot) {
FieldID(long id, RenderScript rs, Script s, int slot) {
super(id, rs);
mScript = s;
mSlot = slot;
@@ -92,7 +92,7 @@ public class Script extends BaseObj {
return f;
}
int id = mRS.nScriptFieldIDCreate(getID(mRS), slot);
long id = mRS.nScriptFieldIDCreate(getID(mRS), slot);
if (id == 0) {
throw new RSDriverException("Failed to create FieldID");
}
@@ -132,11 +132,11 @@ public class Script extends BaseObj {
throw new RSIllegalArgumentException(
"At least one of ain or aout is required to be non-null.");
}
int in_id = 0;
long in_id = 0;
if (ain != null) {
in_id = ain.getID(mRS);
}
int out_id = 0;
long out_id = 0;
if (aout != null) {
out_id = aout.getID(mRS);
}
@@ -161,11 +161,11 @@ public class Script extends BaseObj {
forEach(slot, ain, aout, v);
return;
}
int in_id = 0;
long in_id = 0;
if (ain != null) {
in_id = ain.getID(mRS);
}
int out_id = 0;
long out_id = 0;
if (aout != null) {
out_id = aout.getID(mRS);
}
@@ -176,7 +176,7 @@ public class Script extends BaseObj {
mRS.nScriptForEachClipped(getID(mRS), slot, in_id, out_id, params, sc.xstart, sc.xend, sc.ystart, sc.yend, sc.zstart, sc.zend);
}
Script(int id, RenderScript rs) {
Script(long id, RenderScript rs) {
super(id, rs);
}