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

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

Browse Source 
* commit 'ff1e1d99ea029197051b3cdaa39effc6baa94b53':
  Fix 64 bit compile failures in renderscript
This commit is contained in:
Glenn Kasten
2014-03-19 21:15:38 +00:00
committed by Android Git Automerger
parent 53ee9ecd9d ff1e1d99ea
commit 4f346bf0ff
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); rsnContextSendMessage(mContext, id, data);
} }
native void rsnContextBindRootScript(long con, int script); native void rsnContextBindRootScript(long con, long script);
synchronized void nContextBindRootScript(int script) { synchronized void nContextBindRootScript(long script) {
validate(); validate();
rsnContextBindRootScript(mContext, script); rsnContextBindRootScript(mContext, script);
} }
@@ -249,23 +249,23 @@ public class RenderScript {
validate(); validate();
rsnContextBindSampler(mContext, sampler, slot); rsnContextBindSampler(mContext, sampler, slot);
} }
native void rsnContextBindProgramStore(long con, int pfs); native void rsnContextBindProgramStore(long con, long pfs);
synchronized void nContextBindProgramStore(int pfs) { synchronized void nContextBindProgramStore(long pfs) {
validate(); validate();
rsnContextBindProgramStore(mContext, pfs); rsnContextBindProgramStore(mContext, pfs);
} }
native void rsnContextBindProgramFragment(long con, int pf); native void rsnContextBindProgramFragment(long con, long pf);
synchronized void nContextBindProgramFragment(int pf) { synchronized void nContextBindProgramFragment(long pf) {
validate(); validate();
rsnContextBindProgramFragment(mContext, pf); rsnContextBindProgramFragment(mContext, pf);
} }
native void rsnContextBindProgramVertex(long con, int pv); native void rsnContextBindProgramVertex(long con, long pv);
synchronized void nContextBindProgramVertex(int pv) { synchronized void nContextBindProgramVertex(long pv) {
validate(); validate();
rsnContextBindProgramVertex(mContext, pv); rsnContextBindProgramVertex(mContext, pv);
} }
native void rsnContextBindProgramRaster(long con, int pr); native void rsnContextBindProgramRaster(long con, long pr);
synchronized void nContextBindProgramRaster(int pr) { synchronized void nContextBindProgramRaster(long pr) {
validate(); validate();
rsnContextBindProgramRaster(mContext, pr); rsnContextBindProgramRaster(mContext, pr);
} }

24
rs/jni/android_renderscript_RenderScript.cpp
View File

@@ -455,7 +455,7 @@ nElementGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArra
// we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements
assert(dataSize == 5); assert(dataSize == 5);
uint32_t elementData[5]; uintptr_t elementData[5];
rsaElementGetNativeData((RsContext)con, (RsElement)id, elementData, dataSize); rsaElementGetNativeData((RsContext)con, (RsElement)id, elementData, dataSize);
for(jint i = 0; i < dataSize; i ++) { for(jint i = 0; i < dataSize; i ++) {
@@ -476,7 +476,7 @@ nElementGetSubElements(JNIEnv *_env, jobject _this, jlong con, jlong id,
uintptr_t *ids = (uintptr_t*)malloc(dataSize * sizeof(uintptr_t)); uintptr_t *ids = (uintptr_t*)malloc(dataSize * sizeof(uintptr_t));
const char **names = (const char **)malloc(dataSize * sizeof(const char *)); const char **names = (const char **)malloc(dataSize * sizeof(const char *));
size_t *arraySizes = (size_t *)malloc(dataSize * sizeof(size_t)); uint32_t *arraySizes = (uint32_t *)malloc(dataSize * sizeof(uint32_t));
rsaElementGetSubElements((RsContext)con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize); rsaElementGetSubElements((RsContext)con, (RsElement)id, ids, names, arraySizes, (uint32_t)dataSize);
@@ -1407,35 +1407,35 @@ nProgramRasterCreate(JNIEnv *_env, jobject _this, jlong con, jboolean pointSprit
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static void static void
nContextBindRootScript(JNIEnv *_env, jobject _this, jlong con, jint script) nContextBindRootScript(JNIEnv *_env, jobject _this, jlong con, jlong script)
{ {
LOG_API("nContextBindRootScript, con(%p), script(%p)", (RsContext)con, (RsScript)script); LOG_API("nContextBindRootScript, con(%p), script(%p)", (RsContext)con, (RsScript)script);
rsContextBindRootScript((RsContext)con, (RsScript)script); rsContextBindRootScript((RsContext)con, (RsScript)script);
} }
static void static void
nContextBindProgramStore(JNIEnv *_env, jobject _this, jlong con, jint pfs) nContextBindProgramStore(JNIEnv *_env, jobject _this, jlong con, jlong pfs)
{ {
LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", (RsContext)con, (RsProgramStore)pfs); LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", (RsContext)con, (RsProgramStore)pfs);
rsContextBindProgramStore((RsContext)con, (RsProgramStore)pfs); rsContextBindProgramStore((RsContext)con, (RsProgramStore)pfs);
} }
static void static void
nContextBindProgramFragment(JNIEnv *_env, jobject _this, jlong con, jint pf) nContextBindProgramFragment(JNIEnv *_env, jobject _this, jlong con, jlong pf)
{ {
LOG_API("nContextBindProgramFragment, con(%p), pf(%p)", (RsContext)con, (RsProgramFragment)pf); LOG_API("nContextBindProgramFragment, con(%p), pf(%p)", (RsContext)con, (RsProgramFragment)pf);
rsContextBindProgramFragment((RsContext)con, (RsProgramFragment)pf); rsContextBindProgramFragment((RsContext)con, (RsProgramFragment)pf);
} }
static void static void
nContextBindProgramVertex(JNIEnv *_env, jobject _this, jlong con, jint pf) nContextBindProgramVertex(JNIEnv *_env, jobject _this, jlong con, jlong pf)
{ {
LOG_API("nContextBindProgramVertex, con(%p), pf(%p)", (RsContext)con, (RsProgramVertex)pf); LOG_API("nContextBindProgramVertex, con(%p), pf(%p)", (RsContext)con, (RsProgramVertex)pf);
rsContextBindProgramVertex((RsContext)con, (RsProgramVertex)pf); rsContextBindProgramVertex((RsContext)con, (RsProgramVertex)pf);
} }
static void static void
nContextBindProgramRaster(JNIEnv *_env, jobject _this, jlong con, jint pf) nContextBindProgramRaster(JNIEnv *_env, jobject _this, jlong con, jlong pf)
{ {
LOG_API("nContextBindProgramRaster, con(%p), pf(%p)", (RsContext)con, (RsProgramRaster)pf); LOG_API("nContextBindProgramRaster, con(%p), pf(%p)", (RsContext)con, (RsProgramRaster)pf);
rsContextBindProgramRaster((RsContext)con, (RsProgramRaster)pf); rsContextBindProgramRaster((RsContext)con, (RsProgramRaster)pf);
@@ -1679,11 +1679,11 @@ static JNINativeMethod methods[] = {
{"rsnProgramRasterCreate", "(JZI)J", (void*)nProgramRasterCreate }, {"rsnProgramRasterCreate", "(JZI)J", (void*)nProgramRasterCreate },
{"rsnProgramVertexCreate", "(JLjava/lang/String;[Ljava/lang/String;[J)J", (void*)nProgramVertexCreate }, {"rsnProgramVertexCreate", "(JLjava/lang/String;[Ljava/lang/String;[J)J", (void*)nProgramVertexCreate },
{"rsnContextBindRootScript", "(JI)V", (void*)nContextBindRootScript }, {"rsnContextBindRootScript", "(JJ)V", (void*)nContextBindRootScript },
{"rsnContextBindProgramStore", "(JI)V", (void*)nContextBindProgramStore }, {"rsnContextBindProgramStore", "(JJ)V", (void*)nContextBindProgramStore },
{"rsnContextBindProgramFragment", "(JI)V", (void*)nContextBindProgramFragment }, {"rsnContextBindProgramFragment", "(JJ)V", (void*)nContextBindProgramFragment },
{"rsnContextBindProgramVertex", "(JI)V", (void*)nContextBindProgramVertex }, {"rsnContextBindProgramVertex", "(JJ)V", (void*)nContextBindProgramVertex },
{"rsnContextBindProgramRaster", "(JI)V", (void*)nContextBindProgramRaster }, {"rsnContextBindProgramRaster", "(JJ)V", (void*)nContextBindProgramRaster },
{"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate }, {"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate },