drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 64 bit compile failures in renderscript

Browse Source 
Use uintptr_t for pointers (and not uint32_t) and
also don't assume that size_t is 32 bits wide.

Also uses java longs for passing pointers across
JNI boundaries.

Change-Id: Ie52bd8ae967fbddc911eda3a43cc799d53bbce66
This commit is contained in:
Narayan Kamath
2014-03-19 10:15:51 +00:00
parent 7cb1dfe690
commit 78c0ce5612
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rs/java/android/renderscript/RenderScript.java
View File

@ -239,8 +239,8 @@ public class RenderScript {
rsnContextSendMessage(mContext, id, data);
}
native void rsnContextBindRootScript(long con, int script);
synchronized void nContextBindRootScript(int script) {
native void rsnContextBindRootScript(long con, long script);
synchronized void nContextBindRootScript(long script) {
validate();
rsnContextBindRootScript(mContext, script);
}
@ -249,23 +249,23 @@ public class RenderScript {
validate();
rsnContextBindSampler(mContext, sampler, slot);
}
native void rsnContextBindProgramStore(long con, int pfs);
synchronized void nContextBindProgramStore(int pfs) {
native void rsnContextBindProgramStore(long con, long pfs);
synchronized void nContextBindProgramStore(long pfs) {
validate();
rsnContextBindProgramStore(mContext, pfs);
}
native void rsnContextBindProgramFragment(long con, int pf);
synchronized void nContextBindProgramFragment(int pf) {
native void rsnContextBindProgramFragment(long con, long pf);
synchronized void nContextBindProgramFragment(long pf) {
validate();
rsnContextBindProgramFragment(mContext, pf);
}
native void rsnContextBindProgramVertex(long con, int pv);
synchronized void nContextBindProgramVertex(int pv) {
native void rsnContextBindProgramVertex(long con, long pv);
synchronized void nContextBindProgramVertex(long pv) {
validate();
rsnContextBindProgramVertex(mContext, pv);
}
native void rsnContextBindProgramRaster(long con, int pr);
synchronized void nContextBindProgramRaster(int pr) {
native void rsnContextBindProgramRaster(long con, long pr);
synchronized void nContextBindProgramRaster(long pr) {
validate();
rsnContextBindProgramRaster(mContext, pr);
}