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

am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"

Browse Source 
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
  Fix 64 bit compile failures in renderscript
This commit is contained in:
Glenn Kasten
2014-03-19 21:22:06 +00:00
committed by Android Git Automerger
parent 13403eabb6 4f346bf0ff
commit 5341f881e0
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

@@ -235,8 +235,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);
}
@@ -245,23 +245,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);
}