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

am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"

Browse Source 
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code
This commit is contained in:
Narayan Kamath
2014-02-10 05:37:18 -08:00
committed by Android Git Automerger
parent 379bb6ed4e 56062983f1
commit 578d4f5f50
8 changed files with 96 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rs/java/android/renderscript/BaseObj.java
View File

@ -32,7 +32,7 @@ public class BaseObj {
mDestroyed = false; mDestroyed = false;
} }
void setID(int id) { void setID(long id) {
if (mID != 0) { if (mID != 0) {
throw new RSRuntimeException("Internal Error, reset of object ID."); throw new RSRuntimeException("Internal Error, reset of object ID.");
} }

4
rs/java/android/renderscript/FileA3D.java
View File

@ -141,7 +141,7 @@ public class FileA3D extends BaseObj {
return null; return null;
} }
int objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex); long objectID = rs.nFileA3DGetEntryByIndex(entry.mID, entry.mIndex);
if(objectID == 0) { if(objectID == 0) {
return null; return null;
} }
@ -297,7 +297,7 @@ public class FileA3D extends BaseObj {
long fileId = 0; long fileId = 0;
if (is instanceof AssetManager.AssetInputStream) { if (is instanceof AssetManager.AssetInputStream) {
int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); long asset = ((AssetManager.AssetInputStream) is).getNativeAsset();
fileId = rs.nFileA3DCreateFromAssetStream(asset); fileId = rs.nFileA3DCreateFromAssetStream(asset);
} else { } else {
throw new RSRuntimeException("Unsupported asset stream"); throw new RSRuntimeException("Unsupported asset stream");

10
rs/java/android/renderscript/Font.java
View File

@ -151,7 +151,7 @@ public class Font extends BaseObj {
return "DroidSans.ttf"; return "DroidSans.ttf";
} }
Font(int id, RenderScript rs) { Font(long id, RenderScript rs) {
super(id, rs); super(id, rs);
} }
@ -162,7 +162,7 @@ public class Font extends BaseObj {
static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) { static public Font createFromFile(RenderScript rs, Resources res, String path, float pointSize) {
rs.validate(); rs.validate();
int dpi = res.getDisplayMetrics().densityDpi; int dpi = res.getDisplayMetrics().densityDpi;
int fontId = rs.nFontCreateFromFile(path, pointSize, dpi); long fontId = rs.nFontCreateFromFile(path, pointSize, dpi);
if(fontId == 0) { if(fontId == 0) {
throw new RSRuntimeException("Unable to create font from file " + path); throw new RSRuntimeException("Unable to create font from file " + path);
@ -187,7 +187,7 @@ public class Font extends BaseObj {
AssetManager mgr = res.getAssets(); AssetManager mgr = res.getAssets();
int dpi = res.getDisplayMetrics().densityDpi; int dpi = res.getDisplayMetrics().densityDpi;
int fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi); long fontId = rs.nFontCreateFromAsset(mgr, path, pointSize, dpi);
if(fontId == 0) { if(fontId == 0) {
throw new RSRuntimeException("Unable to create font from asset " + path); throw new RSRuntimeException("Unable to create font from asset " + path);
} }
@ -211,9 +211,9 @@ public class Font extends BaseObj {
int dpi = res.getDisplayMetrics().densityDpi; int dpi = res.getDisplayMetrics().densityDpi;
int fontId = 0; long fontId = 0;
if (is instanceof AssetManager.AssetInputStream) { if (is instanceof AssetManager.AssetInputStream) {
int asset = ((AssetManager.AssetInputStream) is).getAssetInt(); long asset = ((AssetManager.AssetInputStream) is).getNativeAsset();
fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset); fontId = rs.nFontCreateFromAssetStream(name, pointSize, dpi, asset);
} else { } else {
throw new RSRuntimeException("Unsupported asset stream created"); throw new RSRuntimeException("Unsupported asset stream created");

4
rs/java/android/renderscript/ProgramStore.java
View File

@ -146,7 +146,7 @@ public class ProgramStore extends BaseObj {
BlendDstFunc mBlendDst; BlendDstFunc mBlendDst;
boolean mDither; boolean mDither;
ProgramStore(int id, RenderScript rs) { ProgramStore(long id, RenderScript rs) {
super(id, rs); super(id, rs);
} }
@ -421,7 +421,7 @@ public class ProgramStore extends BaseObj {
*/ */
public ProgramStore create() { public ProgramStore create() {
mRS.validate(); mRS.validate();
int id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA, long id = mRS.nProgramStoreCreate(mColorMaskR, mColorMaskG, mColorMaskB, mColorMaskA,
mDepthMask, mDither, mDepthMask, mDither,
mBlendSrc.mID, mBlendDst.mID, mDepthFunc.mID); mBlendSrc.mID, mBlendDst.mID, mDepthFunc.mID);
ProgramStore programStore = new ProgramStore(id, mRS); ProgramStore programStore = new ProgramStore(id, mRS);

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

@ -506,8 +506,8 @@ public class RenderScript {
rsnAllocationResize1D(mContext, id, dimX); rsnAllocationResize1D(mContext, id, dimX);
} }
native long rsnFileA3DCreateFromAssetStream(long con, int assetStream); native long rsnFileA3DCreateFromAssetStream(long con, long assetStream);
synchronized long nFileA3DCreateFromAssetStream(int assetStream) { synchronized long nFileA3DCreateFromAssetStream(long assetStream) {
validate(); validate();
return rsnFileA3DCreateFromAssetStream(mContext, assetStream); return rsnFileA3DCreateFromAssetStream(mContext, assetStream);
} }
@ -531,24 +531,24 @@ public class RenderScript {
validate(); validate();
rsnFileA3DGetIndexEntries(mContext, fileA3D, numEntries, IDs, names); rsnFileA3DGetIndexEntries(mContext, fileA3D, numEntries, IDs, names);
} }
native int rsnFileA3DGetEntryByIndex(long con, long fileA3D, int index); native long rsnFileA3DGetEntryByIndex(long con, long fileA3D, int index);
synchronized int nFileA3DGetEntryByIndex(long fileA3D, int index) { synchronized long nFileA3DGetEntryByIndex(long fileA3D, int index) {
validate(); validate();
return rsnFileA3DGetEntryByIndex(mContext, fileA3D, index); return rsnFileA3DGetEntryByIndex(mContext, fileA3D, index);
} }
native int rsnFontCreateFromFile(long con, String fileName, float size, int dpi); native long rsnFontCreateFromFile(long con, String fileName, float size, int dpi);
synchronized int nFontCreateFromFile(String fileName, float size, int dpi) { synchronized long nFontCreateFromFile(String fileName, float size, int dpi) {
validate(); validate();
return rsnFontCreateFromFile(mContext, fileName, size, dpi); return rsnFontCreateFromFile(mContext, fileName, size, dpi);
} }
native int rsnFontCreateFromAssetStream(long con, String name, float size, int dpi, int assetStream); native long rsnFontCreateFromAssetStream(long con, String name, float size, int dpi, long assetStream);
synchronized int nFontCreateFromAssetStream(String name, float size, int dpi, int assetStream) { synchronized long nFontCreateFromAssetStream(String name, float size, int dpi, long assetStream) {
validate(); validate();
return rsnFontCreateFromAssetStream(mContext, name, size, dpi, assetStream); return rsnFontCreateFromAssetStream(mContext, name, size, dpi, assetStream);
} }
native int rsnFontCreateFromAsset(long con, AssetManager mgr, String path, float size, int dpi); native long rsnFontCreateFromAsset(long con, AssetManager mgr, String path, float size, int dpi);
synchronized int nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) { synchronized long nFontCreateFromAsset(AssetManager mgr, String path, float size, int dpi) {
validate(); validate();
return rsnFontCreateFromAsset(mContext, mgr, path, size, dpi); return rsnFontCreateFromAsset(mContext, mgr, path, size, dpi);
} }
@ -665,9 +665,9 @@ public class RenderScript {
rsnScriptSetVarObj(mContext, id, slot, val); rsnScriptSetVarObj(mContext, id, slot, val);
} }
native int rsnScriptCCreate(long con, String resName, String cacheDir, native long rsnScriptCCreate(long con, String resName, String cacheDir,
byte[] script, int length); byte[] script, int length);
synchronized int nScriptCCreate(String resName, String cacheDir, byte[] script, int length) { synchronized long nScriptCCreate(String resName, String cacheDir, byte[] script, int length) {
validate(); validate();
return rsnScriptCCreate(mContext, resName, cacheDir, script, length); return rsnScriptCCreate(mContext, resName, cacheDir, script, length);
} }
@ -714,18 +714,18 @@ public class RenderScript {
rsnScriptGroupExecute(mContext, group); rsnScriptGroupExecute(mContext, group);
} }
native int rsnSamplerCreate(long con, int magFilter, int minFilter, native long rsnSamplerCreate(long con, int magFilter, int minFilter,
int wrapS, int wrapT, int wrapR, float aniso); int wrapS, int wrapT, int wrapR, float aniso);
synchronized int nSamplerCreate(int magFilter, int minFilter, synchronized long nSamplerCreate(int magFilter, int minFilter,
int wrapS, int wrapT, int wrapR, float aniso) { int wrapS, int wrapT, int wrapR, float aniso) {
validate(); validate();
return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso); return rsnSamplerCreate(mContext, magFilter, minFilter, wrapS, wrapT, wrapR, aniso);
} }
native int rsnProgramStoreCreate(long con, boolean r, boolean g, boolean b, boolean a, native long rsnProgramStoreCreate(long con, boolean r, boolean g, boolean b, boolean a,
boolean depthMask, boolean dither, boolean depthMask, boolean dither,
int srcMode, int dstMode, int depthFunc); int srcMode, int dstMode, int depthFunc);
synchronized int nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a, synchronized long nProgramStoreCreate(boolean r, boolean g, boolean b, boolean a,
boolean depthMask, boolean dither, boolean depthMask, boolean dither,
int srcMode, int dstMode, int depthFunc) { int srcMode, int dstMode, int depthFunc) {
validate(); validate();
@ -791,8 +791,8 @@ public class RenderScript {
rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount); rsnMeshGetIndices(mContext, id, idxIds, primitives, vtxIdCount);
} }
native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, int loop, float q); native long rsnPathCreate(long con, int prim, boolean isStatic, long vtx, long loop, float q);
synchronized long nPathCreate(int prim, boolean isStatic, long vtx, int loop, float q) { synchronized long nPathCreate(int prim, boolean isStatic, long vtx, long loop, float q) {
validate(); validate();
return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q); return rsnPathCreate(mContext, prim, isStatic, vtx, loop, q);
} }

4
rs/java/android/renderscript/Sampler.java
View File

@ -60,7 +60,7 @@ public class Sampler extends BaseObj {
Value mWrapR; Value mWrapR;
float mAniso; float mAniso;
Sampler(int id, RenderScript rs) { Sampler(long id, RenderScript rs) {
super(id, rs); super(id, rs);
} }
@ -347,7 +347,7 @@ public class Sampler extends BaseObj {
public Sampler create() { public Sampler create() {
mRS.validate(); mRS.validate();
int id = mRS.nSamplerCreate(mMag.mID, mMin.mID, long id = mRS.nSamplerCreate(mMag.mID, mMin.mID,
mWrapS.mID, mWrapT.mID, mWrapR.mID, mAniso); mWrapS.mID, mWrapT.mID, mWrapR.mID, mAniso);
Sampler sampler = new Sampler(id, mRS); Sampler sampler = new Sampler(id, mRS);
sampler.mMin = mMin; sampler.mMin = mMin;

16
rs/java/android/renderscript/ScriptC.java
View File

@ -45,7 +45,17 @@ public class ScriptC extends Script {
protected ScriptC(int id, RenderScript rs) { protected ScriptC(int id, RenderScript rs) {
super(id, rs); super(id, rs);
} }
/**
* Only intended for use by the generated derived classes.
*
* @param id
* @param rs
*
* @hide
*/
protected ScriptC(long id, RenderScript rs) {
super(id, rs);
}
/** /**
* Only intended for use by the generated derived classes. * Only intended for use by the generated derived classes.
* *
@ -56,7 +66,7 @@ public class ScriptC extends Script {
*/ */
protected ScriptC(RenderScript rs, Resources resources, int resourceID) { protected ScriptC(RenderScript rs, Resources resources, int resourceID) {
super(0, rs); super(0, rs);
int id = internalCreate(rs, resources, resourceID); long id = internalCreate(rs, resources, resourceID);
if (id == 0) { if (id == 0) {
throw new RSRuntimeException("Loading of ScriptC script failed."); throw new RSRuntimeException("Loading of ScriptC script failed.");
} }
@ -70,7 +80,7 @@ public class ScriptC extends Script {
static String mCachePath; static String mCachePath;
private static synchronized int internalCreate(RenderScript rs, Resources resources, int resourceID) { private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) {
byte[] pgm; byte[] pgm;
int pgmLength; int pgmLength;
InputStream is = resources.openRawResource(resourceID); InputStream is = resources.openRawResource(resourceID);

107
rs/jni/android_renderscript_RenderScript.cpp
View File

@ -220,7 +220,7 @@ static jlong
nDeviceCreate(JNIEnv *_env, jobject _this) nDeviceCreate(JNIEnv *_env, jobject _this)
{ {
LOG_API("nDeviceCreate"); LOG_API("nDeviceCreate");
return (jint)rsDeviceCreate(); return (jlong)rsDeviceCreate();
} }
static void static void
@ -241,17 +241,17 @@ static jlong
nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct) nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct)
{ {
LOG_API("nContextCreate"); LOG_API("nContextCreate");
return (jint)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); return (jlong)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0);
} }
static jlong static jlong
nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer,
int colorMin, int colorPref, jint colorMin, jint colorPref,
int alphaMin, int alphaPref, jint alphaMin, jint alphaPref,
int depthMin, int depthPref, jint depthMin, jint depthPref,
int stencilMin, int stencilPref, jint stencilMin, jint stencilPref,
int samplesMin, int samplesPref, float samplesQ, jint samplesMin, jint samplesPref, jfloat samplesQ,
int dpi) jint dpi)
{ {
RsSurfaceConfig sc; RsSurfaceConfig sc;
sc.alphaMin = alphaMin; sc.alphaMin = alphaMin;
@ -265,7 +265,7 @@ nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer,
sc.samplesQ = samplesQ; sc.samplesQ = samplesQ;
LOG_API("nContextCreateGL"); LOG_API("nContextCreateGL");
return (jint)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi); return (jlong)rsContextCreateGL((RsDevice)dev, ver, sdkVer, sc, dpi);
} }
static void static void
@ -355,7 +355,7 @@ nContextGetUserMessage(JNIEnv *_env, jobject _this, jlong con, jintArray data)
ALOGV("message receive buffer too small. %i", receiveLen); ALOGV("message receive buffer too small. %i", receiveLen);
} }
_env->ReleaseIntArrayElements(data, ptr, 0); _env->ReleaseIntArrayElements(data, ptr, 0);
return id; return (jint)id;
} }
static jint static jint
@ -370,7 +370,7 @@ nContextPeekMessage(JNIEnv *_env, jobject _this, jlong con, jintArray auxData)
auxDataPtr[0] = (jint)subID; auxDataPtr[0] = (jint)subID;
auxDataPtr[1] = (jint)receiveLen; auxDataPtr[1] = (jint)receiveLen;
_env->ReleaseIntArrayElements(auxData, auxDataPtr, 0); _env->ReleaseIntArrayElements(auxData, auxDataPtr, 0);
return id; return (jint)id;
} }
static void nContextInitToClient(JNIEnv *_env, jobject _this, jlong con) static void nContextInitToClient(JNIEnv *_env, jobject _this, jlong con)
@ -432,7 +432,7 @@ nElementCreate2(JNIEnv *_env, jobject _this, jlong con,
_env->ReleaseIntArrayElements(_ids, ids, JNI_ABORT); _env->ReleaseIntArrayElements(_ids, ids, JNI_ABORT);
_env->ReleaseIntArrayElements(_arraySizes, arraySizes, JNI_ABORT); _env->ReleaseIntArrayElements(_arraySizes, arraySizes, JNI_ABORT);
return (jint)id; return (jlong)id;
} }
static void static void
@ -499,7 +499,7 @@ nTypeGetNativeData(JNIEnv *_env, jobject _this, jlong con, jlong id, jintArray _
int elementCount = _env->GetArrayLength(_typeData); int elementCount = _env->GetArrayLength(_typeData);
assert(elementCount == 6); assert(elementCount == 6);
LOG_API("nTypeCreate, con(%p)", (RsContext)con); LOG_API("nTypeGetNativeData, con(%p)", (RsContext)con);
uint32_t typeData[6]; uint32_t typeData[6];
rsaTypeGetNativeData((RsContext)con, (RsType)id, typeData, 6); rsaTypeGetNativeData((RsContext)con, (RsType)id, typeData, 6);
@ -515,7 +515,7 @@ static jlong
nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jint pointer) nAllocationCreateTyped(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mips, jint usage, jint pointer)
{ {
LOG_API("nAllocationCreateTyped, con(%p), type(%p), mip(%i), usage(%i), ptr(%p)", (RsContext)con, (RsElement)type, mips, usage, (void *)pointer); LOG_API("nAllocationCreateTyped, con(%p), type(%p), mip(%i), usage(%i), ptr(%p)", (RsContext)con, (RsElement)type, mips, usage, (void *)pointer);
return (jint) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uint32_t)pointer); return (jlong) rsAllocationCreateTyped((RsContext)con, (RsType)type, (RsAllocationMipmapControl)mips, (uint32_t)usage, (uint32_t)pointer);
} }
static void static void
@ -662,7 +662,7 @@ static void ReleaseBitmapCallback(void *bmp)
static void static void
nAllocationData1D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint offset, jint lod, nAllocationData1D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint offset, jint lod,
jint count, jobject data, int sizeBytes, int dataType) jint count, jobject data, jint sizeBytes, jint dataType)
{ {
RsAllocation *alloc = (RsAllocation *)_alloc; RsAllocation *alloc = (RsAllocation *)_alloc;
LOG_API("nAllocation1DData, con(%p), adapter(%p), offset(%i), count(%i), sizeBytes(%i), dataType(%i)", LOG_API("nAllocation1DData, con(%p), adapter(%p), offset(%i), count(%i), sizeBytes(%i), dataType(%i)",
@ -671,8 +671,8 @@ nAllocationData1D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint off
} }
static void static void
// native void rsnAllocationElementData1D(int con, int id, int xoff, int compIdx, byte[] d, int sizeBytes); // native void rsnAllocationElementData1D(long con, long id, int xoff, int compIdx, byte[] d, int sizeBytes);
nAllocationElementData1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint offset, jint lod, jint compIdx, jbyteArray data, int sizeBytes) nAllocationElementData1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint offset, jint lod, jint compIdx, jbyteArray data, jint sizeBytes)
{ {
jint len = _env->GetArrayLength(data); jint len = _env->GetArrayLength(data);
LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", (RsContext)con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes); LOG_API("nAllocationElementData1D, con(%p), alloc(%p), offset(%i), comp(%i), len(%i), sizeBytes(%i)", (RsContext)con, (RsAllocation)alloc, offset, compIdx, len, sizeBytes);
@ -683,7 +683,7 @@ nAllocationElementData1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, ji
static void static void
nAllocationData2D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint xoff, jint yoff, jint lod, jint _face, nAllocationData2D(JNIEnv *_env, jobject _this, jlong con, jlong _alloc, jint xoff, jint yoff, jint lod, jint _face,
jint w, jint h, jobject data, int sizeBytes, int dataType) jint w, jint h, jobject data, jint sizeBytes, jint dataType)
{ {
RsAllocation *alloc = (RsAllocation *)_alloc; RsAllocation *alloc = (RsAllocation *)_alloc;
RsAllocationCubemapFace face = (RsAllocationCubemapFace)_face; RsAllocationCubemapFace face = (RsAllocationCubemapFace)_face;
@ -797,9 +797,8 @@ nAllocationResize1D(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jint di
static jlong static jlong
nFileA3DCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con, jlong native_asset) nFileA3DCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con, jlong native_asset)
{ {
ALOGV("______nFileA3D %u", (uint32_t) native_asset);
Asset* asset = reinterpret_cast<Asset*>(native_asset); Asset* asset = reinterpret_cast<Asset*>(native_asset);
ALOGV("______nFileA3D %p", asset);
jlong id = (jlong)rsaFileA3DCreateFromMemory((RsContext)con, asset->getBuffer(false), asset->getLength()); jlong id = (jlong)rsaFileA3DCreateFromMemory((RsContext)con, asset->getBuffer(false), asset->getLength());
return id; return id;
@ -837,13 +836,13 @@ nFileA3DGetNumIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D
{ {
int32_t numEntries = 0; int32_t numEntries = 0;
rsaFileA3DGetNumIndexEntries((RsContext)con, &numEntries, (RsFile)fileA3D); rsaFileA3DGetNumIndexEntries((RsContext)con, &numEntries, (RsFile)fileA3D);
return numEntries; return (jint)numEntries;
} }
static void static void
nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint numEntries, jintArray _ids, jobjectArray _entries) nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint numEntries, jintArray _ids, jobjectArray _entries)
{ {
ALOGV("______nFileA3D %u", (uint32_t) fileA3D); ALOGV("______nFileA3D %p", (RsFile) fileA3D);
RsFileIndexEntry *fileEntries = (RsFileIndexEntry*)malloc((uint32_t)numEntries * sizeof(RsFileIndexEntry)); RsFileIndexEntry *fileEntries = (RsFileIndexEntry*)malloc((uint32_t)numEntries * sizeof(RsFileIndexEntry));
rsaFileA3DGetIndexEntries((RsContext)con, fileEntries, (uint32_t)numEntries, (RsFile)fileA3D); rsaFileA3DGetIndexEntries((RsContext)con, fileEntries, (uint32_t)numEntries, (RsFile)fileA3D);
@ -856,43 +855,43 @@ nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, j
free(fileEntries); free(fileEntries);
} }
static int static jlong
nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint index) nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, jlong con, jlong fileA3D, jint index)
{ {
ALOGV("______nFileA3D %u", (uint32_t) fileA3D); ALOGV("______nFileA3D %p", (RsFile) fileA3D);
jint id = (jint)rsaFileA3DGetEntryByIndex((RsContext)con, (uint32_t)index, (RsFile)fileA3D); jlong id = (jlong)rsaFileA3DGetEntryByIndex((RsContext)con, (uint32_t)index, (RsFile)fileA3D);
return id; return id;
} }
// ----------------------------------- // -----------------------------------
static int static jlong
nFontCreateFromFile(JNIEnv *_env, jobject _this, jlong con, nFontCreateFromFile(JNIEnv *_env, jobject _this, jlong con,
jstring fileName, jfloat fontSize, jint dpi) jstring fileName, jfloat fontSize, jint dpi)
{ {
AutoJavaStringToUTF8 fileNameUTF(_env, fileName); AutoJavaStringToUTF8 fileNameUTF(_env, fileName);
jint id = (jint)rsFontCreateFromFile((RsContext)con, jlong id = (jlong)rsFontCreateFromFile((RsContext)con,
fileNameUTF.c_str(), fileNameUTF.length(), fileNameUTF.c_str(), fileNameUTF.length(),
fontSize, dpi); fontSize, dpi);
return id; return id;
} }
static int static jlong
nFontCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con, nFontCreateFromAssetStream(JNIEnv *_env, jobject _this, jlong con,
jstring name, jfloat fontSize, jint dpi, jint native_asset) jstring name, jfloat fontSize, jint dpi, jlong native_asset)
{ {
Asset* asset = reinterpret_cast<Asset*>(native_asset); Asset* asset = reinterpret_cast<Asset*>(native_asset);
AutoJavaStringToUTF8 nameUTF(_env, name); AutoJavaStringToUTF8 nameUTF(_env, name);
jint id = (jint)rsFontCreateFromMemory((RsContext)con, jlong id = (jlong)rsFontCreateFromMemory((RsContext)con,
nameUTF.c_str(), nameUTF.length(), nameUTF.c_str(), nameUTF.length(),
fontSize, dpi, fontSize, dpi,
asset->getBuffer(false), asset->getLength()); asset->getBuffer(false), asset->getLength());
return id; return id;
} }
static int static jlong
nFontCreateFromAsset(JNIEnv *_env, jobject _this, jlong con, jobject _assetMgr, jstring _path, nFontCreateFromAsset(JNIEnv *_env, jobject _this, jlong con, jobject _assetMgr, jstring _path,
jfloat fontSize, jint dpi) jfloat fontSize, jint dpi)
{ {
@ -907,7 +906,7 @@ nFontCreateFromAsset(JNIEnv *_env, jobject _this, jlong con, jobject _assetMgr,
return 0; return 0;
} }
jint id = (jint)rsFontCreateFromMemory((RsContext)con, jlong id = (jlong)rsFontCreateFromMemory((RsContext)con,
str.c_str(), str.length(), str.c_str(), str.length(),
fontSize, dpi, fontSize, dpi,
asset->getBuffer(false), asset->getLength()); asset->getBuffer(false), asset->getLength());
@ -1126,7 +1125,7 @@ nScriptForEachClippedV(JNIEnv *_env, jobject _this, jlong con,
// ----------------------------------- // -----------------------------------
static jint static jlong
nScriptCCreate(JNIEnv *_env, jobject _this, jlong con, nScriptCCreate(JNIEnv *_env, jobject _this, jlong con,
jstring resName, jstring cacheDir, jstring resName, jstring cacheDir,
jbyteArray scriptRef, jint length) jbyteArray scriptRef, jint length)
@ -1135,7 +1134,7 @@ nScriptCCreate(JNIEnv *_env, jobject _this, jlong con,
AutoJavaStringToUTF8 resNameUTF(_env, resName); AutoJavaStringToUTF8 resNameUTF(_env, resName);
AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir); AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir);
jint ret = 0; jlong ret = 0;
jbyte* script_ptr = NULL; jbyte* script_ptr = NULL;
jint _exception = 0; jint _exception = 0;
jint remaining; jint remaining;
@ -1161,7 +1160,7 @@ nScriptCCreate(JNIEnv *_env, jobject _this, jlong con,
//rsScriptCSetText((RsContext)con, (const char *)script_ptr, length); //rsScriptCSetText((RsContext)con, (const char *)script_ptr, length);
ret = (jint)rsScriptCCreate((RsContext)con, ret = (jlong)rsScriptCCreate((RsContext)con,
resNameUTF.c_str(), resNameUTF.length(), resNameUTF.c_str(), resNameUTF.length(),
cacheDirUTF.c_str(), cacheDirUTF.length(), cacheDirUTF.c_str(), cacheDirUTF.length(),
(const char *)script_ptr, length); (const char *)script_ptr, length);
@ -1172,7 +1171,7 @@ exit:
_exception ? JNI_ABORT: 0); _exception ? JNI_ABORT: 0);
} }
return ret; return (jlong)ret;
} }
static jlong static jlong
@ -1186,14 +1185,14 @@ static jlong
nScriptKernelIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot, jint sig) nScriptKernelIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot, jint sig)
{ {
LOG_API("nScriptKernelIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con, (void *)sid, slot, sig); LOG_API("nScriptKernelIDCreate, con(%p) script(%p), slot(%i), sig(%i)", (RsContext)con, (void *)sid, slot, sig);
return (jint)rsScriptKernelIDCreate((RsContext)con, (RsScript)sid, slot, sig); return (jlong)rsScriptKernelIDCreate((RsContext)con, (RsScript)sid, slot, sig);
} }
static jlong static jlong
nScriptFieldIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot) nScriptFieldIDCreate(JNIEnv *_env, jobject _this, jlong con, jlong sid, jint slot)
{ {
LOG_API("nScriptFieldIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con, (void *)sid, slot); LOG_API("nScriptFieldIDCreate, con(%p) script(%p), slot(%i)", (RsContext)con, (void *)sid, slot);
return (jint)rsScriptFieldIDCreate((RsContext)con, (RsScript)sid, slot); return (jlong)rsScriptFieldIDCreate((RsContext)con, (RsScript)sid, slot);
} }
static jlong static jlong
@ -1253,7 +1252,7 @@ nScriptGroupExecute(JNIEnv *_env, jobject _this, jlong con, jlong gid)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static jint static jlong
nProgramStoreCreate(JNIEnv *_env, jobject _this, jlong con, nProgramStoreCreate(JNIEnv *_env, jobject _this, jlong con,
jboolean colorMaskR, jboolean colorMaskG, jboolean colorMaskB, jboolean colorMaskA, jboolean colorMaskR, jboolean colorMaskG, jboolean colorMaskB, jboolean colorMaskA,
jboolean depthMask, jboolean ditherEnable, jboolean depthMask, jboolean ditherEnable,
@ -1261,7 +1260,7 @@ nProgramStoreCreate(JNIEnv *_env, jobject _this, jlong con,
jint depthFunc) jint depthFunc)
{ {
LOG_API("nProgramStoreCreate, con(%p)", (RsContext)con); LOG_API("nProgramStoreCreate, con(%p)", (RsContext)con);
return (jint)rsProgramStoreCreate((RsContext)con, colorMaskR, colorMaskG, colorMaskB, colorMaskA, return (jlong)rsProgramStoreCreate((RsContext)con, colorMaskR, colorMaskG, colorMaskB, colorMaskA,
depthMask, ditherEnable, (RsBlendSrcFunc)srcFunc, depthMask, ditherEnable, (RsBlendSrcFunc)srcFunc,
(RsBlendDstFunc)destFunc, (RsDepthFunc)depthFunc); (RsBlendDstFunc)destFunc, (RsDepthFunc)depthFunc);
} }
@ -1346,7 +1345,7 @@ static jlong
nProgramRasterCreate(JNIEnv *_env, jobject _this, jlong con, jboolean pointSprite, jint cull) nProgramRasterCreate(JNIEnv *_env, jobject _this, jlong con, jboolean pointSprite, jint cull)
{ {
LOG_API("nProgramRasterCreate, con(%p), pointSprite(%i), cull(%i)", (RsContext)con, pointSprite, cull); LOG_API("nProgramRasterCreate, con(%p), pointSprite(%i), cull(%i)", (RsContext)con, pointSprite, cull);
return (jint)rsProgramRasterCreate((RsContext)con, pointSprite, (RsCullMode)cull); return (jlong)rsProgramRasterCreate((RsContext)con, pointSprite, (RsCullMode)cull);
} }
@ -1390,12 +1389,12 @@ nContextBindProgramRaster(JNIEnv *_env, jobject _this, jlong con, jint pf)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static jint static jlong
nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minFilter, nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minFilter,
jint wrapS, jint wrapT, jint wrapR, jfloat aniso) jint wrapS, jint wrapT, jint wrapR, jfloat aniso)
{ {
LOG_API("nSamplerCreate, con(%p)", (RsContext)con); LOG_API("nSamplerCreate, con(%p)", (RsContext)con);
return (jint)rsSamplerCreate((RsContext)con, return (jlong)rsSamplerCreate((RsContext)con,
(RsSamplerValue)magFilter, (RsSamplerValue)magFilter,
(RsSamplerValue)minFilter, (RsSamplerValue)minFilter,
(RsSamplerValue)wrapS, (RsSamplerValue)wrapS,
@ -1407,7 +1406,7 @@ nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minF
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
static jlong static jlong
nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jint _loop, jfloat q) { nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jlong _loop, jfloat q) {
LOG_API("nPathCreate, con(%p)", (RsContext)con); LOG_API("nPathCreate, con(%p)", (RsContext)con);
jlong id = (jlong)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic, jlong id = (jlong)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic,
@ -1526,15 +1525,15 @@ static JNINativeMethod methods[] = {
{"rsnObjDestroy", "(JJ)V", (void*)nObjDestroy }, {"rsnObjDestroy", "(JJ)V", (void*)nObjDestroy },
{"rsnFileA3DCreateFromFile", "(JLjava/lang/String;)J", (void*)nFileA3DCreateFromFile }, {"rsnFileA3DCreateFromFile", "(JLjava/lang/String;)J", (void*)nFileA3DCreateFromFile },
{"rsnFileA3DCreateFromAssetStream", "(JI)J", (void*)nFileA3DCreateFromAssetStream }, {"rsnFileA3DCreateFromAssetStream", "(JJ)J", (void*)nFileA3DCreateFromAssetStream },
{"rsnFileA3DCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;)J", (void*)nFileA3DCreateFromAsset }, {"rsnFileA3DCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;)J", (void*)nFileA3DCreateFromAsset },
{"rsnFileA3DGetNumIndexEntries", "(JJ)I", (void*)nFileA3DGetNumIndexEntries }, {"rsnFileA3DGetNumIndexEntries", "(JJ)I", (void*)nFileA3DGetNumIndexEntries },
{"rsnFileA3DGetIndexEntries", "(JJI[I[Ljava/lang/String;)V", (void*)nFileA3DGetIndexEntries }, {"rsnFileA3DGetIndexEntries", "(JJI[I[Ljava/lang/String;)V", (void*)nFileA3DGetIndexEntries },
{"rsnFileA3DGetEntryByIndex", "(JJI)I", (void*)nFileA3DGetEntryByIndex }, {"rsnFileA3DGetEntryByIndex", "(JJI)J", (void*)nFileA3DGetEntryByIndex },
{"rsnFontCreateFromFile", "(JLjava/lang/String;FI)I", (void*)nFontCreateFromFile }, {"rsnFontCreateFromFile", "(JLjava/lang/String;FI)J", (void*)nFontCreateFromFile },
{"rsnFontCreateFromAssetStream", "(JLjava/lang/String;FII)I", (void*)nFontCreateFromAssetStream }, {"rsnFontCreateFromAssetStream", "(JLjava/lang/String;FIJ)J", (void*)nFontCreateFromAssetStream },
{"rsnFontCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;FI)I", (void*)nFontCreateFromAsset }, {"rsnFontCreateFromAsset", "(JLandroid/content/res/AssetManager;Ljava/lang/String;FI)J", (void*)nFontCreateFromAsset },
{"rsnElementCreate", "(JJIZI)J", (void*)nElementCreate }, {"rsnElementCreate", "(JJIZI)J", (void*)nElementCreate },
{"rsnElementCreate2", "(J[I[Ljava/lang/String;[I)J", (void*)nElementCreate2 }, {"rsnElementCreate2", "(J[I[Ljava/lang/String;[I)J", (void*)nElementCreate2 },
@ -1591,7 +1590,7 @@ static JNINativeMethod methods[] = {
{"rsnScriptSetVarVE", "(JJI[BJ[I)V", (void*)nScriptSetVarVE }, {"rsnScriptSetVarVE", "(JJI[BJ[I)V", (void*)nScriptSetVarVE },
{"rsnScriptSetVarObj", "(JJIJ)V", (void*)nScriptSetVarObj }, {"rsnScriptSetVarObj", "(JJIJ)V", (void*)nScriptSetVarObj },
{"rsnScriptCCreate", "(JLjava/lang/String;Ljava/lang/String;[BI)I", (void*)nScriptCCreate }, {"rsnScriptCCreate", "(JLjava/lang/String;Ljava/lang/String;[BI)J", (void*)nScriptCCreate },
{"rsnScriptIntrinsicCreate", "(JIJ)J", (void*)nScriptIntrinsicCreate }, {"rsnScriptIntrinsicCreate", "(JIJ)J", (void*)nScriptIntrinsicCreate },
{"rsnScriptKernelIDCreate", "(JJII)J", (void*)nScriptKernelIDCreate }, {"rsnScriptKernelIDCreate", "(JJII)J", (void*)nScriptKernelIDCreate },
{"rsnScriptFieldIDCreate", "(JJI)J", (void*)nScriptFieldIDCreate }, {"rsnScriptFieldIDCreate", "(JJI)J", (void*)nScriptFieldIDCreate },
@ -1600,7 +1599,7 @@ static JNINativeMethod methods[] = {
{"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput }, {"rsnScriptGroupSetOutput", "(JJJJ)V", (void*)nScriptGroupSetOutput },
{"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute }, {"rsnScriptGroupExecute", "(JJ)V", (void*)nScriptGroupExecute },
{"rsnProgramStoreCreate", "(JZZZZZZIII)I", (void*)nProgramStoreCreate }, {"rsnProgramStoreCreate", "(JZZZZZZIII)J", (void*)nProgramStoreCreate },
{"rsnProgramBindConstants", "(JJIJ)V", (void*)nProgramBindConstants }, {"rsnProgramBindConstants", "(JJIJ)V", (void*)nProgramBindConstants },
{"rsnProgramBindTexture", "(JJIJ)V", (void*)nProgramBindTexture }, {"rsnProgramBindTexture", "(JJIJ)V", (void*)nProgramBindTexture },
@ -1616,9 +1615,9 @@ static JNINativeMethod methods[] = {
{"rsnContextBindProgramVertex", "(JI)V", (void*)nContextBindProgramVertex }, {"rsnContextBindProgramVertex", "(JI)V", (void*)nContextBindProgramVertex },
{"rsnContextBindProgramRaster", "(JI)V", (void*)nContextBindProgramRaster }, {"rsnContextBindProgramRaster", "(JI)V", (void*)nContextBindProgramRaster },
{"rsnSamplerCreate", "(JIIIIIF)I", (void*)nSamplerCreate }, {"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate },
{"rsnPathCreate", "(JIZJIF)J", (void*)nPathCreate }, {"rsnPathCreate", "(JIZJJF)J", (void*)nPathCreate },
{"rsnMeshCreate", "(J[I[I[I)J", (void*)nMeshCreate }, {"rsnMeshCreate", "(J[I[I[I)J", (void*)nMeshCreate },
{"rsnMeshGetVertexBufferCount", "(JJ)I", (void*)nMeshGetVertexBufferCount }, {"rsnMeshGetVertexBufferCount", "(JJ)I", (void*)nMeshGetVertexBufferCount },
@ -1648,7 +1647,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
assert(env != NULL); assert(env != NULL);
if (registerFuncs(env) < 0) { if (registerFuncs(env) < 0) {
ALOGE("ERROR: MediaPlayer native registration failed\n"); ALOGE("ERROR: Renderscript native registration failed\n");
goto bail; goto bail;
} }