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

8
graphics/java/android/renderscript/Program.java
View File

@@ -74,7 +74,7 @@ public class Program extends BaseObj {
int mTextureCount;
String mShader;
Program(int id, RenderScript rs) {
Program(long id, RenderScript rs) {
super(id, rs);
}
@@ -150,7 +150,7 @@ public class Program extends BaseObj {
a.getType().getID(mRS) != mConstants[slot].getID(mRS)) {
throw new IllegalArgumentException("Allocation type does not match slot type.");
}
int id = a != null ? a.getID(mRS) : 0;
long id = a != null ? a.getID(mRS) : 0;
mRS.nProgramBindConstants(getID(mRS), slot, id);
}
@@ -172,7 +172,7 @@ public class Program extends BaseObj {
throw new IllegalArgumentException("Cannot bind cubemap to 2d texture slot");
}
int id = va != null ? va.getID(mRS) : 0;
long id = va != null ? va.getID(mRS) : 0;
mRS.nProgramBindTexture(getID(mRS), slot, id);
}
@@ -192,7 +192,7 @@ public class Program extends BaseObj {
throw new IllegalArgumentException("Slot ID out of range.");
}
int id = vs != null ? vs.getID(mRS) : 0;
long id = vs != null ? vs.getID(mRS) : 0;
mRS.nProgramBindSampler(getID(mRS), slot, id);
}