diff options
Diffstat (limited to 'graphics/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 870 |
1 files changed, 435 insertions, 435 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index 45cc72e..b2e8dd9 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -37,6 +37,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include "android_runtime/android_view_Surface.h" #include <RenderScript.h> #include <RenderScriptEnv.h> @@ -85,41 +86,43 @@ static void nInitElements(JNIEnv *_env, jobject _this, jint a8, jint rgba4444, j // --------------------------------------------------------------------------- static void -nAssignName(JNIEnv *_env, jobject _this, jint obj, jbyteArray str) +nContextFinish(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nAssignName, con(%p), obj(%p)", con, (void *)obj); + LOG_API("nContextFinish, con(%p)", con); + rsContextFinish(con); +} +static void +nAssignName(JNIEnv *_env, jobject _this, RsContext con, jint obj, jbyteArray str) +{ + LOG_API("nAssignName, con(%p), obj(%p)", con, (void *)obj); jint len = _env->GetArrayLength(str); jbyte * cptr = (jbyte *) _env->GetPrimitiveArrayCritical(str, 0); rsAssignName(con, (void *)obj, (const char *)cptr, len); _env->ReleasePrimitiveArrayCritical(str, cptr, JNI_ABORT); } -static void -nObjDestroy(JNIEnv *_env, jobject _this, jint obj) +static jstring +nGetName(JNIEnv *_env, jobject _this, RsContext con, jint obj) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nObjDestroy, con(%p) obj(%p)", con, (void *)obj); - rsObjDestroy(con, (void *)obj); + LOG_API("nGetName, con(%p), obj(%p)", con, (void *)obj); + const char *name = NULL; + rsGetName(con, (void *)obj, &name); + return _env->NewStringUTF(name); } static void -nObjDestroyOOB(JNIEnv *_env, jobject _this, jint obj) +nObjDestroy(JNIEnv *_env, jobject _this, RsContext con, jint obj) { - // This function only differs from nObjDestroy in that it calls the - // special Out Of Band version of ObjDestroy which is thread safe. - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nObjDestroyOOB, con(%p) obj(%p)", con, (void *)obj); - rsObjDestroyOOB(con, (void *)obj); + LOG_API("nObjDestroy, con(%p) obj(%p)", con, (void *)obj); + rsObjDestroy(con, (void *)obj); } + static jint -nFileOpen(JNIEnv *_env, jobject _this, jbyteArray str) +nFileOpen(JNIEnv *_env, jobject _this, RsContext con, jbyteArray str) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nFileOpen, con(%p)", con); - jint len = _env->GetArrayLength(str); jbyte * cptr = (jbyte *) _env->GetPrimitiveArrayCritical(str, 0); jint ret = (jint)rsFileOpen(con, (const char *)cptr, len); @@ -165,9 +168,8 @@ nContextCreateGL(JNIEnv *_env, jobject _this, jint dev, jint ver, jboolean useDe } static void -nContextSetPriority(JNIEnv *_env, jobject _this, jint p) +nContextSetPriority(JNIEnv *_env, jobject _this, RsContext con, jint p) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("ContextSetPriority, con(%p), priority(%i)", con, p); rsContextSetPriority(con, p); } @@ -175,58 +177,51 @@ nContextSetPriority(JNIEnv *_env, jobject _this, jint p) static void -nContextSetSurface(JNIEnv *_env, jobject _this, jint width, jint height, jobject wnd) +nContextSetSurface(JNIEnv *_env, jobject _this, RsContext con, jint width, jint height, jobject wnd) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextSetSurface, con(%p), width(%i), height(%i), surface(%p)", con, width, height, (Surface *)wnd); Surface * window = NULL; if (wnd == NULL) { } else { - jclass surface_class = _env->FindClass("android/view/Surface"); - jfieldID surfaceFieldID = _env->GetFieldID(surface_class, ANDROID_VIEW_SURFACE_JNI_ID, "I"); - window = (Surface*)_env->GetIntField(wnd, surfaceFieldID); + window = (Surface*) android_Surface_getNativeWindow(_env, wnd).get(); } rsContextSetSurface(con, width, height, window); } static void -nContextDestroy(JNIEnv *_env, jobject _this, jint con) +nContextDestroy(JNIEnv *_env, jobject _this, RsContext con) { - LOG_API("nContextDestroy, con(%p)", (RsContext)con); - rsContextDestroy((RsContext)con); + LOG_API("nContextDestroy, con(%p)", con); + rsContextDestroy(con); } static void -nContextDump(JNIEnv *_env, jobject _this, jint bits) +nContextDump(JNIEnv *_env, jobject _this, RsContext con, jint bits) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextDump, con(%p) bits(%i)", (RsContext)con, bits); rsContextDump((RsContext)con, bits); } static void -nContextPause(JNIEnv *_env, jobject _this) +nContextPause(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextPause, con(%p)", con); rsContextPause(con); } static void -nContextResume(JNIEnv *_env, jobject _this) +nContextResume(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextResume, con(%p)", con); rsContextResume(con); } static jint -nContextGetMessage(JNIEnv *_env, jobject _this, jintArray data, jboolean wait) +nContextGetMessage(JNIEnv *_env, jobject _this, RsContext con, jintArray data, jboolean wait) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nContextGetMessage, con(%p), len(%i)", con, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -239,34 +234,30 @@ nContextGetMessage(JNIEnv *_env, jobject _this, jintArray data, jboolean wait) return id; } -static void nContextInitToClient(JNIEnv *_env, jobject _this) +static void nContextInitToClient(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextInitToClient, con(%p)", con); rsContextInitToClient(con); } -static void nContextDeinitToClient(JNIEnv *_env, jobject _this) +static void nContextDeinitToClient(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextDeinitToClient, con(%p)", con); rsContextDeinitToClient(con); } static jint -nElementCreate(JNIEnv *_env, jobject _this, jint type, jint kind, jboolean norm, jint size) +nElementCreate(JNIEnv *_env, jobject _this, RsContext con, jint type, jint kind, jboolean norm, jint size) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nElementCreate, con(%p), type(%i), kind(%i), norm(%i), size(%i)", con, type, kind, norm, size); return (jint)rsElementCreate(con, (RsDataType)type, (RsDataKind)kind, norm, size); } static jint -nElementCreate2(JNIEnv *_env, jobject _this, jintArray _ids, jobjectArray _names) +nElementCreate2(JNIEnv *_env, jobject _this, RsContext con, jintArray _ids, jobjectArray _names) { int fieldCount = _env->GetArrayLength(_ids); - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nElementCreate2, con(%p)", con); jint *ids = _env->GetIntArrayElements(_ids, NULL); @@ -289,32 +280,85 @@ nElementCreate2(JNIEnv *_env, jobject _this, jintArray _ids, jobjectArray _names return (jint)id; } +static void +nElementGetNativeData(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray _elementData) +{ + int dataSize = _env->GetArrayLength(_elementData); + LOG_API("nElementGetNativeData, con(%p)", con); + + // we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements + assert(dataSize == 5); + + uint32_t elementData[5]; + rsElementGetNativeData(con, (RsElement)id, elementData, dataSize); + + for(jint i = 0; i < dataSize; i ++) { + _env->SetIntArrayRegion(_elementData, i, 1, (const jint*)&elementData[i]); + } +} + + +static void +nElementGetSubElements(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray _IDs, jobjectArray _names) +{ + int dataSize = _env->GetArrayLength(_IDs); + LOG_API("nElementGetSubElements, con(%p)", con); + + uint32_t *ids = (uint32_t *)malloc((uint32_t)dataSize * sizeof(uint32_t)); + const char **names = (const char **)malloc((uint32_t)dataSize * sizeof(const char *)); + + rsElementGetSubElements(con, (RsElement)id, ids, names, (uint32_t)dataSize); + + for(jint i = 0; i < dataSize; i ++) { + _env->SetObjectArrayElement(_names, i, _env->NewStringUTF(names[i])); + _env->SetIntArrayRegion(_IDs, i, 1, (const jint*)&ids[i]); + } + + free(ids); + free(names); +} + // ----------------------------------- static void -nTypeBegin(JNIEnv *_env, jobject _this, jint eID) +nTypeBegin(JNIEnv *_env, jobject _this, RsContext con, jint eID) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nTypeBegin, con(%p) e(%p)", con, (RsElement)eID); rsTypeBegin(con, (RsElement)eID); } static void -nTypeAdd(JNIEnv *_env, jobject _this, jint dim, jint val) +nTypeAdd(JNIEnv *_env, jobject _this, RsContext con, jint dim, jint val) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nTypeAdd, con(%p) dim(%i), val(%i)", con, dim, val); rsTypeAdd(con, (RsDimension)dim, val); } static jint -nTypeCreate(JNIEnv *_env, jobject _this) +nTypeCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nTypeCreate, con(%p)", con); return (jint)rsTypeCreate(con); } +static void +nTypeGetNativeData(JNIEnv *_env, jobject _this, RsContext con, jint id, jintArray _typeData) +{ + // We are packing 6 items: mDimX; mDimY; mDimZ; + // mDimLOD; mDimFaces; mElement; into typeData + int elementCount = _env->GetArrayLength(_typeData); + + assert(elementCount == 6); + LOG_API("nTypeCreate, con(%p)", con); + + uint32_t typeData[6]; + rsTypeGetNativeData(con, (RsType)id, typeData, 6); + + for(jint i = 0; i < elementCount; i ++) { + _env->SetIntArrayRegion(_typeData, i, 1, (const jint*)&typeData[i]); + } +} + static void * SF_LoadInt(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer) { ((int32_t *)buffer)[0] = _env->GetIntField(_obj, _field); @@ -378,7 +422,7 @@ struct TypeCache { //{"nTypeFinalDestroy", "(Landroid/renderscript/Type;)V", (void*)nTypeFinalDestroy }, static void -nTypeFinalDestroy(JNIEnv *_env, jobject _this, jobject _type) +nTypeFinalDestroy(JNIEnv *_env, jobject _this, RsContext con, jobject _type) { TypeCache *tc = (TypeCache *)_env->GetIntField(_type, gTypeNativeCache); free(tc); @@ -386,7 +430,7 @@ nTypeFinalDestroy(JNIEnv *_env, jobject _this, jobject _type) // native void nTypeSetupFields(Type t, int[] types, int[] bits, Field[] IDs); static void -nTypeSetupFields(JNIEnv *_env, jobject _this, jobject _type, jintArray _types, jintArray _bits, jobjectArray _IDs) +nTypeSetupFields(JNIEnv *_env, jobject _this, RsContext con, jobject _type, jintArray _types, jintArray _bits, jobjectArray _IDs) { int fieldCount = _env->GetArrayLength(_types); size_t structSize = sizeof(TypeCache) + (sizeof(TypeFieldCache) * (fieldCount-1)); @@ -436,25 +480,22 @@ nTypeSetupFields(JNIEnv *_env, jobject _this, jobject _type, jintArray _types, j // ----------------------------------- static jint -nAllocationCreateTyped(JNIEnv *_env, jobject _this, jint e) +nAllocationCreateTyped(JNIEnv *_env, jobject _this, RsContext con, jint e) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAllocationCreateTyped, con(%p), e(%p)", con, (RsElement)e); return (jint) rsAllocationCreateTyped(con, (RsElement)e); } static void -nAllocationUploadToTexture(JNIEnv *_env, jobject _this, jint a, jboolean genMip, jint mip) +nAllocationUploadToTexture(JNIEnv *_env, jobject _this, RsContext con, jint a, jboolean genMip, jint mip) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAllocationUploadToTexture, con(%p), a(%p), genMip(%i), mip(%i)", con, (RsAllocation)a, genMip, mip); rsAllocationUploadToTexture(con, (RsAllocation)a, genMip, mip); } static void -nAllocationUploadToBufferObject(JNIEnv *_env, jobject _this, jint a) +nAllocationUploadToBufferObject(JNIEnv *_env, jobject _this, RsContext con, jint a) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAllocationUploadToBufferObject, con(%p), a(%p)", con, (RsAllocation)a); rsAllocationUploadToBufferObject(con, (RsAllocation)a); } @@ -480,9 +521,8 @@ static RsElement SkBitmapToPredefined(SkBitmap::Config cfg) } static int -nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jint dstFmt, jboolean genMips, jobject jbitmap) +nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, RsContext con, jint dstFmt, jboolean genMips, jobject jbitmap) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); SkBitmap const * nativeBitmap = (SkBitmap const *)_env->GetIntField(jbitmap, gNativeBitmapID); const SkBitmap& bitmap(*nativeBitmap); @@ -508,9 +548,8 @@ static void ReleaseBitmapCallback(void *bmp) } static int -nAllocationCreateBitmapRef(JNIEnv *_env, jobject _this, jint type, jobject jbitmap) +nAllocationCreateBitmapRef(JNIEnv *_env, jobject _this, RsContext con, jint type, jobject jbitmap) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); SkBitmap * nativeBitmap = (SkBitmap *)_env->GetIntField(jbitmap, gNativeBitmapID); @@ -522,10 +561,8 @@ nAllocationCreateBitmapRef(JNIEnv *_env, jobject _this, jint type, jobject jbitm } static int -nAllocationCreateFromAssetStream(JNIEnv *_env, jobject _this, jint dstFmt, jboolean genMips, jint native_asset) +nAllocationCreateFromAssetStream(JNIEnv *_env, jobject _this, RsContext con, jint dstFmt, jboolean genMips, jint native_asset) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - Asset* asset = reinterpret_cast<Asset*>(native_asset); SkBitmap bitmap; SkImageDecoder::DecodeMemory(asset->getBuffer(false), asset->getLength(), @@ -548,9 +585,8 @@ nAllocationCreateFromAssetStream(JNIEnv *_env, jobject _this, jint dstFmt, jbool } static int -nAllocationCreateFromBitmapBoxed(JNIEnv *_env, jobject _this, jint dstFmt, jboolean genMips, jobject jbitmap) +nAllocationCreateFromBitmapBoxed(JNIEnv *_env, jobject _this, RsContext con, jint dstFmt, jboolean genMips, jobject jbitmap) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); SkBitmap const * nativeBitmap = (SkBitmap const *)_env->GetIntField(jbitmap, gNativeBitmapID); const SkBitmap& bitmap(*nativeBitmap); @@ -572,9 +608,8 @@ nAllocationCreateFromBitmapBoxed(JNIEnv *_env, jobject _this, jint dstFmt, jbool static void -nAllocationSubData1D_i(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jintArray data, int sizeBytes) +nAllocationSubData1D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint count, jintArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation1DSubData_i, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -583,9 +618,8 @@ nAllocationSubData1D_i(JNIEnv *_env, jobject _this, jint alloc, jint offset, jin } static void -nAllocationSubData1D_s(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jshortArray data, int sizeBytes) +nAllocationSubData1D_s(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint count, jshortArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation1DSubData_s, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); jshort *ptr = _env->GetShortArrayElements(data, NULL); @@ -594,9 +628,8 @@ nAllocationSubData1D_s(JNIEnv *_env, jobject _this, jint alloc, jint offset, jin } static void -nAllocationSubData1D_b(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jbyteArray data, int sizeBytes) +nAllocationSubData1D_b(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint count, jbyteArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation1DSubData_b, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); jbyte *ptr = _env->GetByteArrayElements(data, NULL); @@ -605,9 +638,8 @@ nAllocationSubData1D_b(JNIEnv *_env, jobject _this, jint alloc, jint offset, jin } static void -nAllocationSubData1D_f(JNIEnv *_env, jobject _this, jint alloc, jint offset, jint count, jfloatArray data, int sizeBytes) +nAllocationSubData1D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint offset, jint count, jfloatArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation1DSubData_f, con(%p), adapter(%p), offset(%i), count(%i), len(%i), sizeBytes(%i)", con, (RsAllocation)alloc, offset, count, len, sizeBytes); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -616,9 +648,8 @@ nAllocationSubData1D_f(JNIEnv *_env, jobject _this, jint alloc, jint offset, jin } static void -nAllocationSubData2D_i(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jintArray data, int sizeBytes) +nAllocationSubData2D_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint w, jint h, jintArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation2DSubData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -627,9 +658,8 @@ nAllocationSubData2D_i(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint } static void -nAllocationSubData2D_f(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint yoff, jint w, jint h, jfloatArray data, int sizeBytes) +nAllocationSubData2D_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jint xoff, jint yoff, jint w, jint h, jfloatArray data, int sizeBytes) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocation2DSubData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAllocation)alloc, xoff, yoff, w, h, len); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -638,9 +668,8 @@ nAllocationSubData2D_f(JNIEnv *_env, jobject _this, jint alloc, jint xoff, jint } static void -nAllocationRead_i(JNIEnv *_env, jobject _this, jint alloc, jintArray data) +nAllocationRead_i(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jintArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -649,9 +678,8 @@ nAllocationRead_i(JNIEnv *_env, jobject _this, jint alloc, jintArray data) } static void -nAllocationRead_f(JNIEnv *_env, jobject _this, jint alloc, jfloatArray data) +nAllocationRead_f(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jfloatArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAllocationRead_f, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -662,9 +690,8 @@ nAllocationRead_f(JNIEnv *_env, jobject _this, jint alloc, jfloatArray data) //{"nAllocationDataFromObject", "(ILandroid/renderscript/Type;Ljava/lang/Object;)V", (void*)nAllocationDataFromObject }, static void -nAllocationSubDataFromObject(JNIEnv *_env, jobject _this, jint alloc, jobject _type, jint offset, jobject _o) +nAllocationSubDataFromObject(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jobject _type, jint offset, jobject _o) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAllocationDataFromObject con(%p), alloc(%p)", con, (RsAllocation)alloc); const TypeCache *tc = (TypeCache *)_env->GetIntField(_type, gTypeNativeCache); @@ -680,9 +707,8 @@ nAllocationSubDataFromObject(JNIEnv *_env, jobject _this, jint alloc, jobject _t } static void -nAllocationSubReadFromObject(JNIEnv *_env, jobject _this, jint alloc, jobject _type, jint offset, jobject _o) +nAllocationSubReadFromObject(JNIEnv *_env, jobject _this, RsContext con, jint alloc, jobject _type, jint offset, jobject _o) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAllocationReadFromObject con(%p), alloc(%p)", con, (RsAllocation)alloc); assert(offset == 0); @@ -700,29 +726,89 @@ nAllocationSubReadFromObject(JNIEnv *_env, jobject _this, jint alloc, jobject _t free(bufAlloc); } +static jint +nAllocationGetType(JNIEnv *_env, jobject _this, RsContext con, jint a) +{ + LOG_API("nAllocationGetType, con(%p), a(%p)", con, (RsAllocation)a); + return (jint) rsAllocationGetType(con, (RsAllocation)a); +} // ----------------------------------- +static int +nFileA3DCreateFromAssetStream(JNIEnv *_env, jobject _this, RsContext con, jint native_asset) +{ + LOGV("______nFileA3D %u", (uint32_t) native_asset); + + Asset* asset = reinterpret_cast<Asset*>(native_asset); + + jint id = (jint)rsFileA3DCreateFromAssetStream(con, asset->getBuffer(false), asset->getLength()); + return id; +} + +static int +nFileA3DGetNumIndexEntries(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D) +{ + int32_t numEntries = 0; + rsFileA3DGetNumIndexEntries(con, &numEntries, (RsFile)fileA3D); + return numEntries; +} + static void -nAdapter1DBindAllocation(JNIEnv *_env, jobject _this, jint adapter, jint alloc) +nFileA3DGetIndexEntries(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D, jint numEntries, jintArray _ids, jobjectArray _entries) +{ + LOGV("______nFileA3D %u", (uint32_t) fileA3D); + RsFileIndexEntry *fileEntries = (RsFileIndexEntry*)malloc((uint32_t)numEntries * sizeof(RsFileIndexEntry)); + + rsFileA3DGetIndexEntries(con, fileEntries, (uint32_t)numEntries, (RsFile)fileA3D); + + for(jint i = 0; i < numEntries; i ++) { + _env->SetObjectArrayElement(_entries, i, _env->NewStringUTF(fileEntries[i].objectName)); + _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&fileEntries[i].classID); + } + + free(fileEntries); +} + +static int +nFileA3DGetEntryByIndex(JNIEnv *_env, jobject _this, RsContext con, jint fileA3D, jint index) +{ + LOGV("______nFileA3D %u", (uint32_t) fileA3D); + jint id = (jint)rsFileA3DGetEntryByIndex(con, (uint32_t)index, (RsFile)fileA3D); + return id; +} + +// ----------------------------------- + +static int +nFontCreateFromFile(JNIEnv *_env, jobject _this, RsContext con, jstring fileName, jint fontSize, jint dpi) +{ + const char* fileNameUTF = _env->GetStringUTFChars(fileName, NULL); + + jint id = (jint)rsFontCreateFromFile(con, fileNameUTF, fontSize, dpi); + return id; +} + + +// ----------------------------------- + +static void +nAdapter1DBindAllocation(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint alloc) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter1DBindAllocation, con(%p), adapter(%p), alloc(%p)", con, (RsAdapter1D)adapter, (RsAllocation)alloc); rsAdapter1DBindAllocation(con, (RsAdapter1D)adapter, (RsAllocation)alloc); } static void -nAdapter1DSetConstraint(JNIEnv *_env, jobject _this, jint adapter, jint dim, jint value) +nAdapter1DSetConstraint(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint dim, jint value) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter1DSetConstraint, con(%p), adapter(%p), dim(%i), value(%i)", con, (RsAdapter1D)adapter, dim, value); rsAdapter1DSetConstraint(con, (RsAdapter1D)adapter, (RsDimension)dim, value); } static void -nAdapter1DData_i(JNIEnv *_env, jobject _this, jint adapter, jintArray data) +nAdapter1DData_i(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jintArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter1DData_i, con(%p), adapter(%p), len(%i)", con, (RsAdapter1D)adapter, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -731,9 +817,8 @@ nAdapter1DData_i(JNIEnv *_env, jobject _this, jint adapter, jintArray data) } static void -nAdapter1DSubData_i(JNIEnv *_env, jobject _this, jint adapter, jint offset, jint count, jintArray data) +nAdapter1DSubData_i(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint offset, jint count, jintArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter1DSubData_i, con(%p), adapter(%p), offset(%i), count(%i), len(%i)", con, (RsAdapter1D)adapter, offset, count, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -742,9 +827,8 @@ nAdapter1DSubData_i(JNIEnv *_env, jobject _this, jint adapter, jint offset, jint } static void -nAdapter1DData_f(JNIEnv *_env, jobject _this, jint adapter, jfloatArray data) +nAdapter1DData_f(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jfloatArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter1DData_f, con(%p), adapter(%p), len(%i)", con, (RsAdapter1D)adapter, len); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -753,9 +837,8 @@ nAdapter1DData_f(JNIEnv *_env, jobject _this, jint adapter, jfloatArray data) } static void -nAdapter1DSubData_f(JNIEnv *_env, jobject _this, jint adapter, jint offset, jint count, jfloatArray data) +nAdapter1DSubData_f(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint offset, jint count, jfloatArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter1DSubData_f, con(%p), adapter(%p), offset(%i), count(%i), len(%i)", con, (RsAdapter1D)adapter, offset, count, len); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -764,9 +847,8 @@ nAdapter1DSubData_f(JNIEnv *_env, jobject _this, jint adapter, jint offset, jint } static jint -nAdapter1DCreate(JNIEnv *_env, jobject _this) +nAdapter1DCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter1DCreate, con(%p)", con); return (jint)rsAdapter1DCreate(con); } @@ -774,25 +856,22 @@ nAdapter1DCreate(JNIEnv *_env, jobject _this) // ----------------------------------- static void -nAdapter2DBindAllocation(JNIEnv *_env, jobject _this, jint adapter, jint alloc) +nAdapter2DBindAllocation(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint alloc) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter2DBindAllocation, con(%p), adapter(%p), alloc(%p)", con, (RsAdapter2D)adapter, (RsAllocation)alloc); rsAdapter2DBindAllocation(con, (RsAdapter2D)adapter, (RsAllocation)alloc); } static void -nAdapter2DSetConstraint(JNIEnv *_env, jobject _this, jint adapter, jint dim, jint value) +nAdapter2DSetConstraint(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint dim, jint value) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter2DSetConstraint, con(%p), adapter(%p), dim(%i), value(%i)", con, (RsAdapter2D)adapter, dim, value); rsAdapter2DSetConstraint(con, (RsAdapter2D)adapter, (RsDimension)dim, value); } static void -nAdapter2DData_i(JNIEnv *_env, jobject _this, jint adapter, jintArray data) +nAdapter2DData_i(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jintArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter2DData_i, con(%p), adapter(%p), len(%i)", con, (RsAdapter2D)adapter, len); jint *ptr = _env->GetIntArrayElements(data, NULL); @@ -801,9 +880,8 @@ nAdapter2DData_i(JNIEnv *_env, jobject _this, jint adapter, jintArray data) } static void -nAdapter2DData_f(JNIEnv *_env, jobject _this, jint adapter, jfloatArray data) +nAdapter2DData_f(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jfloatArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter2DData_f, con(%p), adapter(%p), len(%i)", con, (RsAdapter2D)adapter, len); jfloat *ptr = _env->GetFloatArrayElements(data, NULL); @@ -812,9 +890,8 @@ nAdapter2DData_f(JNIEnv *_env, jobject _this, jint adapter, jfloatArray data) } static void -nAdapter2DSubData_i(JNIEnv *_env, jobject _this, jint adapter, jint xoff, jint yoff, jint w, jint h, jintArray data) +nAdapter2DSubData_i(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint xoff, jint yoff, jint w, jint h, jintArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter2DSubData_i, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAdapter2D)adapter, xoff, yoff, w, h, len); @@ -824,9 +901,8 @@ nAdapter2DSubData_i(JNIEnv *_env, jobject _this, jint adapter, jint xoff, jint y } static void -nAdapter2DSubData_f(JNIEnv *_env, jobject _this, jint adapter, jint xoff, jint yoff, jint w, jint h, jfloatArray data) +nAdapter2DSubData_f(JNIEnv *_env, jobject _this, RsContext con, jint adapter, jint xoff, jint yoff, jint w, jint h, jfloatArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint len = _env->GetArrayLength(data); LOG_API("nAdapter2DSubData_f, con(%p), adapter(%p), xoff(%i), yoff(%i), w(%i), h(%i), len(%i)", con, (RsAdapter2D)adapter, xoff, yoff, w, h, len); @@ -836,9 +912,8 @@ nAdapter2DSubData_f(JNIEnv *_env, jobject _this, jint adapter, jint xoff, jint y } static jint -nAdapter2DCreate(JNIEnv *_env, jobject _this) +nAdapter2DCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nAdapter2DCreate, con(%p)", con); return (jint)rsAdapter2DCreate(con); } @@ -846,41 +921,40 @@ nAdapter2DCreate(JNIEnv *_env, jobject _this) // ----------------------------------- static void -nScriptBindAllocation(JNIEnv *_env, jobject _this, jint script, jint alloc, jint slot) +nScriptBindAllocation(JNIEnv *_env, jobject _this, RsContext con, jint script, jint alloc, jint slot) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nScriptBindAllocation, con(%p), script(%p), alloc(%p), slot(%i)", con, (RsScript)script, (RsAllocation)alloc, slot); rsScriptBindAllocation(con, (RsScript)script, (RsAllocation)alloc, slot); } static void -nScriptSetClearColor(JNIEnv *_env, jobject _this, jint script, jfloat r, jfloat g, jfloat b, jfloat a) +nScriptSetVarI(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jint val) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptSetClearColor, con(%p), s(%p), r(%f), g(%f), b(%f), a(%f)", con, (void *)script, r, g, b, a); - rsScriptSetClearColor(con, (RsScript)script, r, g, b, a); + LOG_API("nScriptSetVarI, con(%p), s(%p), slot(%i), val(%i), b(%f), a(%f)", con, (void *)script, slot, val); + rsScriptSetVarI(con, (RsScript)script, slot, val); } static void -nScriptSetClearDepth(JNIEnv *_env, jobject _this, jint script, jfloat d) +nScriptSetVarF(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, float val) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptCSetClearDepth, con(%p), s(%p), depth(%f)", con, (void *)script, d); - rsScriptSetClearDepth(con, (RsScript)script, d); + LOG_API("nScriptSetVarI, con(%p), s(%p), slot(%i), val(%i), b(%f), a(%f)", con, (void *)script, slot, val); + rsScriptSetVarF(con, (RsScript)script, slot, val); } static void -nScriptSetClearStencil(JNIEnv *_env, jobject _this, jint script, jint stencil) +nScriptSetVarV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptCSetClearStencil, con(%p), s(%p), stencil(%i)", con, (void *)script, stencil); - rsScriptSetClearStencil(con, (RsScript)script, stencil); + LOG_API("nScriptSetVarV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptSetVarV(con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); } + static void -nScriptSetTimeZone(JNIEnv *_env, jobject _this, jint script, jbyteArray timeZone) +nScriptSetTimeZone(JNIEnv *_env, jobject _this, RsContext con, jint script, jbyteArray timeZone) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nScriptCSetTimeZone, con(%p), s(%p), timeZone(%s)", con, (void *)script, (const char *)timeZone); jint length = _env->GetArrayLength(timeZone); @@ -895,66 +969,36 @@ nScriptSetTimeZone(JNIEnv *_env, jobject _this, jint script, jbyteArray timeZone } static void -nScriptSetType(JNIEnv *_env, jobject _this, jint type, jboolean writable, jstring _str, jint slot) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptCAddType, con(%p), type(%p), writable(%i), slot(%i)", con, (RsType)type, writable, slot); - const char* n = NULL; - if (_str) { - n = _env->GetStringUTFChars(_str, NULL); - } - rsScriptSetType(con, (RsType)type, slot, writable, n); - if (n) { - _env->ReleaseStringUTFChars(_str, n); - } -} - -static void -nScriptSetInvoke(JNIEnv *_env, jobject _this, jstring _str, jint slot) +nScriptInvoke(JNIEnv *_env, jobject _this, RsContext con, jint obj, jint slot) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptSetInvoke, con(%p)", con); - const char* n = NULL; - if (_str) { - n = _env->GetStringUTFChars(_str, NULL); - } - rsScriptSetInvoke(con, n, slot); - if (n) { - _env->ReleaseStringUTFChars(_str, n); - } -} - -static void -nScriptInvoke(JNIEnv *_env, jobject _this, jint obj, jint slot) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nScriptInvoke, con(%p), script(%p)", con, (void *)obj); rsScriptInvoke(con, (RsScript)obj, slot); } static void -nScriptSetRoot(JNIEnv *_env, jobject _this, jboolean isRoot) +nScriptInvokeV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slot, jbyteArray data) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nScriptCSetRoot, con(%p), isRoot(%i)", con, isRoot); - rsScriptSetRoot(con, isRoot); + LOG_API("nScriptInvokeV, con(%p), s(%p), slot(%i)", con, (void *)script, slot); + jint len = _env->GetArrayLength(data); + jbyte *ptr = _env->GetByteArrayElements(data, NULL); + rsScriptInvokeV(con, (RsScript)script, slot, ptr, len); + _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); } + // ----------------------------------- static void -nScriptCBegin(JNIEnv *_env, jobject _this) +nScriptCBegin(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nScriptCBegin, con(%p)", con); rsScriptCBegin(con); } static void -nScriptCSetScript(JNIEnv *_env, jobject _this, jbyteArray scriptRef, +nScriptCSetScript(JNIEnv *_env, jobject _this, RsContext con, jbyteArray scriptRef, jint offset, jint length) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("!!! nScriptCSetScript, con(%p)", con); jint _exception = 0; jint remaining; @@ -995,114 +1039,82 @@ exit: } static jint -nScriptCCreate(JNIEnv *_env, jobject _this) +nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nScriptCCreate, con(%p)", con); return (jint)rsScriptCCreate(con); } -static void -nScriptCAddDefineI32(JNIEnv *_env, jobject _this, jstring name, jint value) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - const char* n = _env->GetStringUTFChars(name, NULL); - LOG_API("nScriptCAddDefineI32, con(%p) name(%s) value(%d)", con, n, value); - rsScriptCSetDefineI32(con, n, value); - _env->ReleaseStringUTFChars(name, n); -} - -static void -nScriptCAddDefineF(JNIEnv *_env, jobject _this, jstring name, jfloat value) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - const char* n = _env->GetStringUTFChars(name, NULL); - LOG_API("nScriptCAddDefineF, con(%p) name(%s) value(%f)", con, n, value); - rsScriptCSetDefineF(con, n, value); - _env->ReleaseStringUTFChars(name, n); -} - // --------------------------------------------------------------------------- static void -nProgramFragmentStoreBegin(JNIEnv *_env, jobject _this, jint in, jint out) +nProgramStoreBegin(JNIEnv *_env, jobject _this, RsContext con, jint in, jint out) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreBegin, con(%p), in(%p), out(%p)", con, (RsElement)in, (RsElement)out); - rsProgramFragmentStoreBegin(con, (RsElement)in, (RsElement)out); + LOG_API("nProgramStoreBegin, con(%p), in(%p), out(%p)", con, (RsElement)in, (RsElement)out); + rsProgramStoreBegin(con, (RsElement)in, (RsElement)out); } static void -nProgramFragmentStoreDepthFunc(JNIEnv *_env, jobject _this, jint func) +nProgramStoreDepthFunc(JNIEnv *_env, jobject _this, RsContext con, jint func) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreDepthFunc, con(%p), func(%i)", con, func); - rsProgramFragmentStoreDepthFunc(con, (RsDepthFunc)func); + LOG_API("nProgramStoreDepthFunc, con(%p), func(%i)", con, func); + rsProgramStoreDepthFunc(con, (RsDepthFunc)func); } static void -nProgramFragmentStoreDepthMask(JNIEnv *_env, jobject _this, jboolean enable) +nProgramStoreDepthMask(JNIEnv *_env, jobject _this, RsContext con, jboolean enable) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreDepthMask, con(%p), enable(%i)", con, enable); - rsProgramFragmentStoreDepthMask(con, enable); + LOG_API("nProgramStoreDepthMask, con(%p), enable(%i)", con, enable); + rsProgramStoreDepthMask(con, enable); } static void -nProgramFragmentStoreColorMask(JNIEnv *_env, jobject _this, jboolean r, jboolean g, jboolean b, jboolean a) +nProgramStoreColorMask(JNIEnv *_env, jobject _this, RsContext con, jboolean r, jboolean g, jboolean b, jboolean a) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreColorMask, con(%p), r(%i), g(%i), b(%i), a(%i)", con, r, g, b, a); - rsProgramFragmentStoreColorMask(con, r, g, b, a); + LOG_API("nProgramStoreColorMask, con(%p), r(%i), g(%i), b(%i), a(%i)", con, r, g, b, a); + rsProgramStoreColorMask(con, r, g, b, a); } static void -nProgramFragmentStoreBlendFunc(JNIEnv *_env, jobject _this, int src, int dst) +nProgramStoreBlendFunc(JNIEnv *_env, jobject _this, RsContext con, int src, int dst) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreBlendFunc, con(%p), src(%i), dst(%i)", con, src, dst); - rsProgramFragmentStoreBlendFunc(con, (RsBlendSrcFunc)src, (RsBlendDstFunc)dst); + LOG_API("nProgramStoreBlendFunc, con(%p), src(%i), dst(%i)", con, src, dst); + rsProgramStoreBlendFunc(con, (RsBlendSrcFunc)src, (RsBlendDstFunc)dst); } static void -nProgramFragmentStoreDither(JNIEnv *_env, jobject _this, jboolean enable) +nProgramStoreDither(JNIEnv *_env, jobject _this, RsContext con, jboolean enable) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreDither, con(%p), enable(%i)", con, enable); - rsProgramFragmentStoreDither(con, enable); + LOG_API("nProgramStoreDither, con(%p), enable(%i)", con, enable); + rsProgramStoreDither(con, enable); } static jint -nProgramFragmentStoreCreate(JNIEnv *_env, jobject _this) +nProgramStoreCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramFragmentStoreCreate, con(%p)", con); - - return (jint)rsProgramFragmentStoreCreate(con); + LOG_API("nProgramStoreCreate, con(%p)", con); + return (jint)rsProgramStoreCreate(con); } // --------------------------------------------------------------------------- static void -nProgramBindConstants(JNIEnv *_env, jobject _this, jint vpv, jint slot, jint a) +nProgramBindConstants(JNIEnv *_env, jobject _this, RsContext con, jint vpv, jint slot, jint a) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nProgramBindConstants, con(%p), vpf(%p), sloat(%i), a(%p)", con, (RsProgramVertex)vpv, slot, (RsAllocation)a); rsProgramBindConstants(con, (RsProgram)vpv, slot, (RsAllocation)a); } static void -nProgramBindTexture(JNIEnv *_env, jobject _this, jint vpf, jint slot, jint a) +nProgramBindTexture(JNIEnv *_env, jobject _this, RsContext con, jint vpf, jint slot, jint a) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nProgramBindTexture, con(%p), vpf(%p), slot(%i), a(%p)", con, (RsProgramFragment)vpf, slot, (RsAllocation)a); rsProgramBindTexture(con, (RsProgramFragment)vpf, slot, (RsAllocation)a); } static void -nProgramBindSampler(JNIEnv *_env, jobject _this, jint vpf, jint slot, jint a) +nProgramBindSampler(JNIEnv *_env, jobject _this, RsContext con, jint vpf, jint slot, jint a) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nProgramBindSampler, con(%p), vpf(%p), slot(%i), a(%p)", con, (RsProgramFragment)vpf, slot, (RsSampler)a); rsProgramBindSampler(con, (RsProgramFragment)vpf, slot, (RsSampler)a); } @@ -1110,9 +1122,8 @@ nProgramBindSampler(JNIEnv *_env, jobject _this, jint vpf, jint slot, jint a) // --------------------------------------------------------------------------- static jint -nProgramFragmentCreate(JNIEnv *_env, jobject _this, jintArray params) +nProgramFragmentCreate(JNIEnv *_env, jobject _this, RsContext con, jintArray params) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); jint *paramPtr = _env->GetIntArrayElements(params, NULL); jint paramLen = _env->GetArrayLength(params); @@ -1124,9 +1135,8 @@ nProgramFragmentCreate(JNIEnv *_env, jobject _this, jintArray params) } static jint -nProgramFragmentCreate2(JNIEnv *_env, jobject _this, jstring shader, jintArray params) +nProgramFragmentCreate2(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); const char* shaderUTF = _env->GetStringUTFChars(shader, NULL); jint shaderLen = _env->GetStringUTFLength(shader); jint *paramPtr = _env->GetIntArrayElements(params, NULL); @@ -1144,17 +1154,15 @@ nProgramFragmentCreate2(JNIEnv *_env, jobject _this, jstring shader, jintArray p // --------------------------------------------------------------------------- static jint -nProgramVertexCreate(JNIEnv *_env, jobject _this, jboolean texMat) +nProgramVertexCreate(JNIEnv *_env, jobject _this, RsContext con, jboolean texMat) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nProgramVertexCreate, con(%p), texMat(%i)", con, texMat); return (jint)rsProgramVertexCreate(con, texMat); } static jint -nProgramVertexCreate2(JNIEnv *_env, jobject _this, jstring shader, jintArray params) +nProgramVertexCreate2(JNIEnv *_env, jobject _this, RsContext con, jstring shader, jintArray params) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); const char* shaderUTF = _env->GetStringUTFChars(shader, NULL); jint shaderLen = _env->GetStringUTFLength(shader); jint *paramPtr = _env->GetIntArrayElements(params, NULL); @@ -1171,70 +1179,61 @@ nProgramVertexCreate2(JNIEnv *_env, jobject _this, jstring shader, jintArray par // --------------------------------------------------------------------------- static jint -nProgramRasterCreate(JNIEnv *_env, jobject _this, jint in, jint out, - jboolean pointSmooth, jboolean lineSmooth, jboolean pointSprite) +nProgramRasterCreate(JNIEnv *_env, jobject _this, RsContext con, jboolean pointSmooth, jboolean lineSmooth, jboolean pointSprite) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramRasterCreate, con(%p), in(%p), out(%p), pointSmooth(%i), lineSmooth(%i), pointSprite(%i)", - con, (RsElement)in, (RsElement)out, pointSmooth, lineSmooth, pointSprite); - return (jint)rsProgramRasterCreate(con, (RsElement)in, (RsElement)out, pointSmooth, lineSmooth, pointSprite); + LOG_API("nProgramRasterCreate, con(%p), pointSmooth(%i), lineSmooth(%i), pointSprite(%i)", + con, pointSmooth, lineSmooth, pointSprite); + return (jint)rsProgramRasterCreate(con, pointSmooth, lineSmooth, pointSprite); } static void -nProgramRasterSetPointSize(JNIEnv *_env, jobject _this, jint vpr, jfloat v) +nProgramRasterSetLineWidth(JNIEnv *_env, jobject _this, RsContext con, jint vpr, jfloat v) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramRasterSetPointSize, con(%p), vpf(%p), value(%f)", con, (RsProgramRaster)vpr, v); - rsProgramRasterSetPointSize(con, (RsProgramFragment)vpr, v); + LOG_API("nProgramRasterSetLineWidth, con(%p), vpf(%p), value(%f)", con, (RsProgramRaster)vpr, v); + rsProgramRasterSetLineWidth(con, (RsProgramRaster)vpr, v); } static void -nProgramRasterSetLineWidth(JNIEnv *_env, jobject _this, jint vpr, jfloat v) +nProgramRasterSetCullMode(JNIEnv *_env, jobject _this, RsContext con, jint vpr, jint v) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nProgramRasterSetLineWidth, con(%p), vpf(%p), value(%f)", con, (RsProgramRaster)vpr, v); - rsProgramRasterSetLineWidth(con, (RsProgramFragment)vpr, v); + LOG_API("nProgramRasterSetCullMode, con(%p), vpf(%p), value(%i)", con, (RsProgramRaster)vpr, v); + rsProgramRasterSetCullMode(con, (RsProgramRaster)vpr, (RsCullMode)v); } // --------------------------------------------------------------------------- static void -nContextBindRootScript(JNIEnv *_env, jobject _this, jint script) +nContextBindRootScript(JNIEnv *_env, jobject _this, RsContext con, jint script) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextBindRootScript, con(%p), script(%p)", con, (RsScript)script); rsContextBindRootScript(con, (RsScript)script); } static void -nContextBindProgramFragmentStore(JNIEnv *_env, jobject _this, jint pfs) +nContextBindProgramStore(JNIEnv *_env, jobject _this, RsContext con, jint pfs) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nContextBindProgramFragmentStore, con(%p), pfs(%p)", con, (RsProgramFragmentStore)pfs); - rsContextBindProgramFragmentStore(con, (RsProgramFragmentStore)pfs); + LOG_API("nContextBindProgramStore, con(%p), pfs(%p)", con, (RsProgramStore)pfs); + rsContextBindProgramStore(con, (RsProgramStore)pfs); } static void -nContextBindProgramFragment(JNIEnv *_env, jobject _this, jint pf) +nContextBindProgramFragment(JNIEnv *_env, jobject _this, RsContext con, jint pf) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextBindProgramFragment, con(%p), pf(%p)", con, (RsProgramFragment)pf); rsContextBindProgramFragment(con, (RsProgramFragment)pf); } static void -nContextBindProgramVertex(JNIEnv *_env, jobject _this, jint pf) +nContextBindProgramVertex(JNIEnv *_env, jobject _this, RsContext con, jint pf) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextBindProgramVertex, con(%p), pf(%p)", con, (RsProgramVertex)pf); rsContextBindProgramVertex(con, (RsProgramVertex)pf); } static void -nContextBindProgramRaster(JNIEnv *_env, jobject _this, jint pf) +nContextBindProgramRaster(JNIEnv *_env, jobject _this, RsContext con, jint pf) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nContextBindProgramRaster, con(%p), pf(%p)", con, (RsProgramRaster)pf); rsContextBindProgramRaster(con, (RsProgramRaster)pf); } @@ -1243,108 +1242,100 @@ nContextBindProgramRaster(JNIEnv *_env, jobject _this, jint pf) // --------------------------------------------------------------------------- static void -nSamplerBegin(JNIEnv *_env, jobject _this) +nSamplerBegin(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nSamplerBegin, con(%p)", con); rsSamplerBegin(con); } static void -nSamplerSet(JNIEnv *_env, jobject _this, jint p, jint v) +nSamplerSet(JNIEnv *_env, jobject _this, RsContext con, jint p, jint v) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nSamplerSet, con(%p), param(%i), value(%i)", con, p, v); rsSamplerSet(con, (RsSamplerParam)p, (RsSamplerValue)v); } static jint -nSamplerCreate(JNIEnv *_env, jobject _this) +nSamplerCreate(JNIEnv *_env, jobject _this, RsContext con) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); LOG_API("nSamplerCreate, con(%p)", con); return (jint)rsSamplerCreate(con); } // --------------------------------------------------------------------------- -static void -nLightBegin(JNIEnv *_env, jobject _this) +static jint +nMeshCreate(JNIEnv *_env, jobject _this, RsContext con, jint vtxCount, jint idxCount) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightBegin, con(%p)", con); - rsLightBegin(con); + LOG_API("nMeshCreate, con(%p), vtxCount(%i), idxCount(%i)", con, vtxCount, idxCount); + int id = (int)rsMeshCreate(con, vtxCount, idxCount); + return id; } static void -nLightSetIsMono(JNIEnv *_env, jobject _this, jboolean isMono) +nMeshBindVertex(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jint alloc, jint slot) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightSetIsMono, con(%p), isMono(%i)", con, isMono); - rsLightSetMonochromatic(con, isMono); + LOG_API("nMeshBindVertex, con(%p), Mesh(%p), Alloc(%p), slot(%i)", con, (RsMesh)mesh, (RsAllocation)alloc, slot); + rsMeshBindVertex(con, (RsMesh)mesh, (RsAllocation)alloc, slot); } static void -nLightSetIsLocal(JNIEnv *_env, jobject _this, jboolean isLocal) +nMeshBindIndex(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jint alloc, jint primID, jint slot) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightSetIsLocal, con(%p), isLocal(%i)", con, isLocal); - rsLightSetLocal(con, isLocal); + LOG_API("nMeshBindIndex, con(%p), Mesh(%p), Alloc(%p)", con, (RsMesh)mesh, (RsAllocation)alloc); + rsMeshBindIndex(con, (RsMesh)mesh, (RsAllocation)alloc, primID, slot); } static jint -nLightCreate(JNIEnv *_env, jobject _this) +nMeshGetVertexBufferCount(JNIEnv *_env, jobject _this, RsContext con, jint mesh) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightCreate, con(%p)", con); - return (jint)rsLightCreate(con); + LOG_API("nMeshGetVertexBufferCount, con(%p), Mesh(%p)", con, (RsMesh)mesh); + jint vtxCount = 0; + rsMeshGetVertexBufferCount(con, (RsMesh)mesh, &vtxCount); + return vtxCount; } -static void -nLightSetColor(JNIEnv *_env, jobject _this, jint light, float r, float g, float b) +static jint +nMeshGetIndexCount(JNIEnv *_env, jobject _this, RsContext con, jint mesh) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightSetColor, con(%p), light(%p), r(%f), g(%f), b(%f)", con, (RsLight)light, r, g, b); - rsLightSetColor(con, (RsLight)light, r, g, b); + LOG_API("nMeshGetIndexCount, con(%p), Mesh(%p)", con, (RsMesh)mesh); + jint idxCount = 0; + rsMeshGetIndexCount(con, (RsMesh)mesh, &idxCount); + return idxCount; } static void -nLightSetPosition(JNIEnv *_env, jobject _this, jint light, float x, float y, float z) +nMeshGetVertices(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jintArray _ids, int numVtxIDs) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nLightSetPosition, con(%p), light(%p), x(%f), y(%f), z(%f)", con, (RsLight)light, x, y, z); - rsLightSetPosition(con, (RsLight)light, x, y, z); -} + LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", con, (RsMesh)mesh); -// --------------------------------------------------------------------------- + RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numVtxIDs * sizeof(RsAllocation)); + rsMeshGetVertices(con, (RsMesh)mesh, allocs, (uint32_t)numVtxIDs); -static jint -nSimpleMeshCreate(JNIEnv *_env, jobject _this, jint batchID, jint indexID, jintArray vtxIDs, jint primID) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - jint len = _env->GetArrayLength(vtxIDs); - LOG_API("nSimpleMeshCreate, con(%p), batchID(%i), indexID(%i), vtxIDs.len(%i), primID(%i)", - con, batchID, indexID, len, primID); - jint *ptr = _env->GetIntArrayElements(vtxIDs, NULL); - int id = (int)rsSimpleMeshCreate(con, (void *)batchID, (void *)indexID, (void **)ptr, len, primID); - _env->ReleaseIntArrayElements(vtxIDs, ptr, 0/*JNI_ABORT*/); - return id; -} + for(jint i = 0; i < numVtxIDs; i ++) { + _env->SetIntArrayRegion(_ids, i, 1, (const jint*)&allocs[i]); + } -static void -nSimpleMeshBindVertex(JNIEnv *_env, jobject _this, jint s, jint alloc, jint slot) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nSimpleMeshBindVertex, con(%p), SimpleMesh(%p), Alloc(%p), slot(%i)", con, (RsSimpleMesh)s, (RsAllocation)alloc, slot); - rsSimpleMeshBindVertex(con, (RsSimpleMesh)s, (RsAllocation)alloc, slot); + free(allocs); } static void -nSimpleMeshBindIndex(JNIEnv *_env, jobject _this, jint s, jint alloc) +nMeshGetIndices(JNIEnv *_env, jobject _this, RsContext con, jint mesh, jintArray _idxIds, jintArray _primitives, int numIndices) { - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nSimpleMeshBindIndex, con(%p), SimpleMesh(%p), Alloc(%p)", con, (RsSimpleMesh)s, (RsAllocation)alloc); - rsSimpleMeshBindIndex(con, (RsSimpleMesh)s, (RsAllocation)alloc); + LOG_API("nMeshGetVertices, con(%p), Mesh(%p)", con, (RsMesh)mesh); + + RsAllocation *allocs = (RsAllocation*)malloc((uint32_t)numIndices * sizeof(RsAllocation)); + uint32_t *prims= (uint32_t*)malloc((uint32_t)numIndices * sizeof(uint32_t)); + + rsMeshGetIndices(con, (RsMesh)mesh, allocs, prims, (uint32_t)numIndices); + + for(jint i = 0; i < numIndices; i ++) { + _env->SetIntArrayRegion(_idxIds, i, 1, (const jint*)&allocs[i]); + _env->SetIntArrayRegion(_primitives, i, 1, (const jint*)&prims[i]); + } + + free(allocs); + free(prims); } // --------------------------------------------------------------------------- @@ -1359,124 +1350,132 @@ static JNINativeMethod methods[] = { {"nDeviceCreate", "()I", (void*)nDeviceCreate }, {"nDeviceDestroy", "(I)V", (void*)nDeviceDestroy }, {"nDeviceSetConfig", "(III)V", (void*)nDeviceSetConfig }, -{"nContextCreate", "(II)I", (void*)nContextCreate }, -{"nContextCreateGL", "(IIZ)I", (void*)nContextCreateGL }, -{"nContextSetPriority", "(I)V", (void*)nContextSetPriority }, -{"nContextSetSurface", "(IILandroid/view/Surface;)V", (void*)nContextSetSurface }, -{"nContextDestroy", "(I)V", (void*)nContextDestroy }, -{"nContextDump", "(I)V", (void*)nContextDump }, -{"nContextPause", "()V", (void*)nContextPause }, -{"nContextResume", "()V", (void*)nContextResume }, -{"nAssignName", "(I[B)V", (void*)nAssignName }, -{"nObjDestroy", "(I)V", (void*)nObjDestroy }, -{"nObjDestroyOOB", "(I)V", (void*)nObjDestroyOOB }, -{"nContextGetMessage", "([IZ)I", (void*)nContextGetMessage }, -{"nContextInitToClient", "()V", (void*)nContextInitToClient }, -{"nContextDeinitToClient", "()V", (void*)nContextDeinitToClient }, - -{"nFileOpen", "([B)I", (void*)nFileOpen }, - -{"nElementCreate", "(IIZI)I", (void*)nElementCreate }, -{"nElementCreate2", "([I[Ljava/lang/String;)I", (void*)nElementCreate2 }, - -{"nTypeBegin", "(I)V", (void*)nTypeBegin }, -{"nTypeAdd", "(II)V", (void*)nTypeAdd }, -{"nTypeCreate", "()I", (void*)nTypeCreate }, -{"nTypeFinalDestroy", "(Landroid/renderscript/Type;)V", (void*)nTypeFinalDestroy }, -{"nTypeSetupFields", "(Landroid/renderscript/Type;[I[I[Ljava/lang/reflect/Field;)V", (void*)nTypeSetupFields }, - -{"nAllocationCreateTyped", "(I)I", (void*)nAllocationCreateTyped }, -{"nAllocationCreateFromBitmap", "(IZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmap }, -{"nAllocationCreateBitmapRef", "(ILandroid/graphics/Bitmap;)I", (void*)nAllocationCreateBitmapRef }, -{"nAllocationCreateFromBitmapBoxed","(IZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmapBoxed }, -{"nAllocationCreateFromAssetStream","(IZI)I", (void*)nAllocationCreateFromAssetStream }, -{"nAllocationUploadToTexture", "(IZI)V", (void*)nAllocationUploadToTexture }, -{"nAllocationUploadToBufferObject","(I)V", (void*)nAllocationUploadToBufferObject }, -{"nAllocationSubData1D", "(III[II)V", (void*)nAllocationSubData1D_i }, -{"nAllocationSubData1D", "(III[SI)V", (void*)nAllocationSubData1D_s }, -{"nAllocationSubData1D", "(III[BI)V", (void*)nAllocationSubData1D_b }, -{"nAllocationSubData1D", "(III[FI)V", (void*)nAllocationSubData1D_f }, -{"nAllocationSubData2D", "(IIIII[II)V", (void*)nAllocationSubData2D_i }, -{"nAllocationSubData2D", "(IIIII[FI)V", (void*)nAllocationSubData2D_f }, -{"nAllocationRead", "(I[I)V", (void*)nAllocationRead_i }, -{"nAllocationRead", "(I[F)V", (void*)nAllocationRead_f }, -{"nAllocationSubDataFromObject", "(ILandroid/renderscript/Type;ILjava/lang/Object;)V", (void*)nAllocationSubDataFromObject }, -{"nAllocationSubReadFromObject", "(ILandroid/renderscript/Type;ILjava/lang/Object;)V", (void*)nAllocationSubReadFromObject }, - -{"nAdapter1DBindAllocation", "(II)V", (void*)nAdapter1DBindAllocation }, -{"nAdapter1DSetConstraint", "(III)V", (void*)nAdapter1DSetConstraint }, -{"nAdapter1DData", "(I[I)V", (void*)nAdapter1DData_i }, -{"nAdapter1DData", "(I[F)V", (void*)nAdapter1DData_f }, -{"nAdapter1DSubData", "(III[I)V", (void*)nAdapter1DSubData_i }, -{"nAdapter1DSubData", "(III[F)V", (void*)nAdapter1DSubData_f }, -{"nAdapter1DCreate", "()I", (void*)nAdapter1DCreate }, - -{"nAdapter2DBindAllocation", "(II)V", (void*)nAdapter2DBindAllocation }, -{"nAdapter2DSetConstraint", "(III)V", (void*)nAdapter2DSetConstraint }, -{"nAdapter2DData", "(I[I)V", (void*)nAdapter2DData_i }, -{"nAdapter2DData", "(I[F)V", (void*)nAdapter2DData_f }, -{"nAdapter2DSubData", "(IIIII[I)V", (void*)nAdapter2DSubData_i }, -{"nAdapter2DSubData", "(IIIII[F)V", (void*)nAdapter2DSubData_f }, -{"nAdapter2DCreate", "()I", (void*)nAdapter2DCreate }, - -{"nScriptBindAllocation", "(III)V", (void*)nScriptBindAllocation }, -{"nScriptSetClearColor", "(IFFFF)V", (void*)nScriptSetClearColor }, -{"nScriptSetClearDepth", "(IF)V", (void*)nScriptSetClearDepth }, -{"nScriptSetClearStencil", "(II)V", (void*)nScriptSetClearStencil }, -{"nScriptSetTimeZone", "(I[B)V", (void*)nScriptSetTimeZone }, -{"nScriptSetType", "(IZLjava/lang/String;I)V", (void*)nScriptSetType }, -{"nScriptSetRoot", "(Z)V", (void*)nScriptSetRoot }, -{"nScriptSetInvokable", "(Ljava/lang/String;I)V", (void*)nScriptSetInvoke }, -{"nScriptInvoke", "(II)V", (void*)nScriptInvoke }, - -{"nScriptCBegin", "()V", (void*)nScriptCBegin }, -{"nScriptCSetScript", "([BII)V", (void*)nScriptCSetScript }, -{"nScriptCCreate", "()I", (void*)nScriptCCreate }, -{"nScriptCAddDefineI32", "(Ljava/lang/String;I)V", (void*)nScriptCAddDefineI32 }, -{"nScriptCAddDefineF", "(Ljava/lang/String;F)V", (void*)nScriptCAddDefineF }, - -{"nProgramFragmentStoreBegin", "(II)V", (void*)nProgramFragmentStoreBegin }, -{"nProgramFragmentStoreDepthFunc", "(I)V", (void*)nProgramFragmentStoreDepthFunc }, -{"nProgramFragmentStoreDepthMask", "(Z)V", (void*)nProgramFragmentStoreDepthMask }, -{"nProgramFragmentStoreColorMask", "(ZZZZ)V", (void*)nProgramFragmentStoreColorMask }, -{"nProgramFragmentStoreBlendFunc", "(II)V", (void*)nProgramFragmentStoreBlendFunc }, -{"nProgramFragmentStoreDither", "(Z)V", (void*)nProgramFragmentStoreDither }, -{"nProgramFragmentStoreCreate", "()I", (void*)nProgramFragmentStoreCreate }, - -{"nProgramBindConstants", "(III)V", (void*)nProgramBindConstants }, -{"nProgramBindTexture", "(III)V", (void*)nProgramBindTexture }, -{"nProgramBindSampler", "(III)V", (void*)nProgramBindSampler }, - -{"nProgramFragmentCreate", "([I)I", (void*)nProgramFragmentCreate }, -{"nProgramFragmentCreate2", "(Ljava/lang/String;[I)I", (void*)nProgramFragmentCreate2 }, - -{"nProgramRasterCreate", "(IIZZZ)I", (void*)nProgramRasterCreate }, -{"nProgramRasterSetPointSize", "(IF)V", (void*)nProgramRasterSetPointSize }, -{"nProgramRasterSetLineWidth", "(IF)V", (void*)nProgramRasterSetLineWidth }, - -{"nProgramVertexCreate", "(Z)I", (void*)nProgramVertexCreate }, -{"nProgramVertexCreate2", "(Ljava/lang/String;[I)I", (void*)nProgramVertexCreate2 }, - -{"nLightBegin", "()V", (void*)nLightBegin }, -{"nLightSetIsMono", "(Z)V", (void*)nLightSetIsMono }, -{"nLightSetIsLocal", "(Z)V", (void*)nLightSetIsLocal }, -{"nLightCreate", "()I", (void*)nLightCreate }, -{"nLightSetColor", "(IFFF)V", (void*)nLightSetColor }, -{"nLightSetPosition", "(IFFF)V", (void*)nLightSetPosition }, - -{"nContextBindRootScript", "(I)V", (void*)nContextBindRootScript }, -{"nContextBindProgramFragmentStore","(I)V", (void*)nContextBindProgramFragmentStore }, -{"nContextBindProgramFragment", "(I)V", (void*)nContextBindProgramFragment }, -{"nContextBindProgramVertex", "(I)V", (void*)nContextBindProgramVertex }, -{"nContextBindProgramRaster", "(I)V", (void*)nContextBindProgramRaster }, - -{"nSamplerBegin", "()V", (void*)nSamplerBegin }, -{"nSamplerSet", "(II)V", (void*)nSamplerSet }, -{"nSamplerCreate", "()I", (void*)nSamplerCreate }, - -{"nSimpleMeshCreate", "(II[II)I", (void*)nSimpleMeshCreate }, -{"nSimpleMeshBindVertex", "(III)V", (void*)nSimpleMeshBindVertex }, -{"nSimpleMeshBindIndex", "(II)V", (void*)nSimpleMeshBindIndex }, +{"nContextGetMessage", "(I[IZ)I", (void*)nContextGetMessage }, +{"nContextInitToClient", "(I)V", (void*)nContextInitToClient }, +{"nContextDeinitToClient", "(I)V", (void*)nContextDeinitToClient }, + + +// All methods below are thread protected in java. +{"rsnContextCreate", "(II)I", (void*)nContextCreate }, +{"rsnContextCreateGL", "(IIZ)I", (void*)nContextCreateGL }, +{"rsnContextFinish", "(I)V", (void*)nContextFinish }, +{"rsnContextSetPriority", "(II)V", (void*)nContextSetPriority }, +{"rsnContextSetSurface", "(IIILandroid/view/Surface;)V", (void*)nContextSetSurface }, +{"rsnContextDestroy", "(I)V", (void*)nContextDestroy }, +{"rsnContextDump", "(II)V", (void*)nContextDump }, +{"rsnContextPause", "(I)V", (void*)nContextPause }, +{"rsnContextResume", "(I)V", (void*)nContextResume }, +{"rsnAssignName", "(II[B)V", (void*)nAssignName }, +{"rsnGetName", "(II)Ljava/lang/String;", (void*)nGetName }, +{"rsnObjDestroy", "(II)V", (void*)nObjDestroy }, + +{"rsnFileOpen", "(I[B)I", (void*)nFileOpen }, +{"rsnFileA3DCreateFromAssetStream", "(II)I", (void*)nFileA3DCreateFromAssetStream }, +{"rsnFileA3DGetNumIndexEntries", "(II)I", (void*)nFileA3DGetNumIndexEntries }, +{"rsnFileA3DGetIndexEntries", "(III[I[Ljava/lang/String;)V", (void*)nFileA3DGetIndexEntries }, +{"rsnFileA3DGetEntryByIndex", "(III)I", (void*)nFileA3DGetEntryByIndex }, + +{"rsnFontCreateFromFile", "(ILjava/lang/String;II)I", (void*)nFontCreateFromFile }, + +{"rsnElementCreate", "(IIIZI)I", (void*)nElementCreate }, +{"rsnElementCreate2", "(I[I[Ljava/lang/String;)I", (void*)nElementCreate2 }, +{"rsnElementGetNativeData", "(II[I)V", (void*)nElementGetNativeData }, +{"rsnElementGetSubElements", "(II[I[Ljava/lang/String;)V", (void*)nElementGetSubElements }, + +{"rsnTypeBegin", "(II)V", (void*)nTypeBegin }, +{"rsnTypeAdd", "(III)V", (void*)nTypeAdd }, +{"rsnTypeCreate", "(I)I", (void*)nTypeCreate }, +{"rsnTypeFinalDestroy", "(ILandroid/renderscript/Type;)V", (void*)nTypeFinalDestroy }, +{"rsnTypeSetupFields", "(ILandroid/renderscript/Type;[I[I[Ljava/lang/reflect/Field;)V", (void*)nTypeSetupFields }, +{"rsnTypeGetNativeData", "(II[I)V", (void*)nTypeGetNativeData }, + +{"rsnAllocationCreateTyped", "(II)I", (void*)nAllocationCreateTyped }, +{"rsnAllocationCreateFromBitmap", "(IIZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmap }, +{"rsnAllocationCreateBitmapRef", "(IILandroid/graphics/Bitmap;)I", (void*)nAllocationCreateBitmapRef }, +{"rsnAllocationCreateFromBitmapBoxed","(IIZLandroid/graphics/Bitmap;)I", (void*)nAllocationCreateFromBitmapBoxed }, +{"rsnAllocationCreateFromAssetStream","(IIZI)I", (void*)nAllocationCreateFromAssetStream }, +{"rsnAllocationUploadToTexture", "(IIZI)V", (void*)nAllocationUploadToTexture }, +{"rsnAllocationUploadToBufferObject","(II)V", (void*)nAllocationUploadToBufferObject }, +{"rsnAllocationSubData1D", "(IIII[II)V", (void*)nAllocationSubData1D_i }, +{"rsnAllocationSubData1D", "(IIII[SI)V", (void*)nAllocationSubData1D_s }, +{"rsnAllocationSubData1D", "(IIII[BI)V", (void*)nAllocationSubData1D_b }, +{"rsnAllocationSubData1D", "(IIII[FI)V", (void*)nAllocationSubData1D_f }, +{"rsnAllocationSubData2D", "(IIIIII[II)V", (void*)nAllocationSubData2D_i }, +{"rsnAllocationSubData2D", "(IIIIII[FI)V", (void*)nAllocationSubData2D_f }, +{"rsnAllocationRead", "(II[I)V", (void*)nAllocationRead_i }, +{"rsnAllocationRead", "(II[F)V", (void*)nAllocationRead_f }, +{"rsnAllocationSubDataFromObject", "(IILandroid/renderscript/Type;ILjava/lang/Object;)V", (void*)nAllocationSubDataFromObject }, +{"rsnAllocationSubReadFromObject", "(IILandroid/renderscript/Type;ILjava/lang/Object;)V", (void*)nAllocationSubReadFromObject }, +{"rsnAllocationGetType", "(II)I", (void*)nAllocationGetType}, + +{"rsnAdapter1DBindAllocation", "(III)V", (void*)nAdapter1DBindAllocation }, +{"rsnAdapter1DSetConstraint", "(IIII)V", (void*)nAdapter1DSetConstraint }, +{"rsnAdapter1DData", "(II[I)V", (void*)nAdapter1DData_i }, +{"rsnAdapter1DData", "(II[F)V", (void*)nAdapter1DData_f }, +{"rsnAdapter1DSubData", "(IIII[I)V", (void*)nAdapter1DSubData_i }, +{"rsnAdapter1DSubData", "(IIII[F)V", (void*)nAdapter1DSubData_f }, +{"rsnAdapter1DCreate", "(I)I", (void*)nAdapter1DCreate }, + +{"rsnAdapter2DBindAllocation", "(III)V", (void*)nAdapter2DBindAllocation }, +{"rsnAdapter2DSetConstraint", "(IIII)V", (void*)nAdapter2DSetConstraint }, +{"rsnAdapter2DData", "(II[I)V", (void*)nAdapter2DData_i }, +{"rsnAdapter2DData", "(II[F)V", (void*)nAdapter2DData_f }, +{"rsnAdapter2DSubData", "(IIIIII[I)V", (void*)nAdapter2DSubData_i }, +{"rsnAdapter2DSubData", "(IIIIII[F)V", (void*)nAdapter2DSubData_f }, +{"rsnAdapter2DCreate", "(I)I", (void*)nAdapter2DCreate }, + +{"rsnScriptBindAllocation", "(IIII)V", (void*)nScriptBindAllocation }, +{"rsnScriptSetTimeZone", "(II[B)V", (void*)nScriptSetTimeZone }, +{"rsnScriptInvoke", "(III)V", (void*)nScriptInvoke }, +{"rsnScriptInvokeV", "(III[B)V", (void*)nScriptInvokeV }, +{"rsnScriptSetVarI", "(IIII)V", (void*)nScriptSetVarI }, +{"rsnScriptSetVarF", "(IIIF)V", (void*)nScriptSetVarF }, +{"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV }, + +{"rsnScriptCBegin", "(I)V", (void*)nScriptCBegin }, +{"rsnScriptCSetScript", "(I[BII)V", (void*)nScriptCSetScript }, +{"rsnScriptCCreate", "(I)I", (void*)nScriptCCreate }, + +{"rsnProgramStoreBegin", "(III)V", (void*)nProgramStoreBegin }, +{"rsnProgramStoreDepthFunc", "(II)V", (void*)nProgramStoreDepthFunc }, +{"rsnProgramStoreDepthMask", "(IZ)V", (void*)nProgramStoreDepthMask }, +{"rsnProgramStoreColorMask", "(IZZZZ)V", (void*)nProgramStoreColorMask }, +{"rsnProgramStoreBlendFunc", "(III)V", (void*)nProgramStoreBlendFunc }, +{"rsnProgramStoreDither", "(IZ)V", (void*)nProgramStoreDither }, +{"rsnProgramStoreCreate", "(I)I", (void*)nProgramStoreCreate }, + +{"rsnProgramBindConstants", "(IIII)V", (void*)nProgramBindConstants }, +{"rsnProgramBindTexture", "(IIII)V", (void*)nProgramBindTexture }, +{"rsnProgramBindSampler", "(IIII)V", (void*)nProgramBindSampler }, + +{"rsnProgramFragmentCreate", "(I[I)I", (void*)nProgramFragmentCreate }, +{"rsnProgramFragmentCreate2", "(ILjava/lang/String;[I)I", (void*)nProgramFragmentCreate2 }, + +{"rsnProgramRasterCreate", "(IZZZ)I", (void*)nProgramRasterCreate }, +{"rsnProgramRasterSetLineWidth", "(IIF)V", (void*)nProgramRasterSetLineWidth }, +{"rsnProgramRasterSetCullMode", "(III)V", (void*)nProgramRasterSetCullMode }, + +{"rsnProgramVertexCreate", "(IZ)I", (void*)nProgramVertexCreate }, +{"rsnProgramVertexCreate2", "(ILjava/lang/String;[I)I", (void*)nProgramVertexCreate2 }, + +{"rsnContextBindRootScript", "(II)V", (void*)nContextBindRootScript }, +{"rsnContextBindProgramStore", "(II)V", (void*)nContextBindProgramStore }, +{"rsnContextBindProgramFragment", "(II)V", (void*)nContextBindProgramFragment }, +{"rsnContextBindProgramVertex", "(II)V", (void*)nContextBindProgramVertex }, +{"rsnContextBindProgramRaster", "(II)V", (void*)nContextBindProgramRaster }, + +{"rsnSamplerBegin", "(I)V", (void*)nSamplerBegin }, +{"rsnSamplerSet", "(III)V", (void*)nSamplerSet }, +{"rsnSamplerCreate", "(I)I", (void*)nSamplerCreate }, + +{"rsnMeshCreate", "(III)I", (void*)nMeshCreate }, +{"rsnMeshBindVertex", "(IIII)V", (void*)nMeshBindVertex }, +{"rsnMeshBindIndex", "(IIIII)V", (void*)nMeshBindIndex }, + +{"rsnMeshGetVertexBufferCount", "(II)I", (void*)nMeshGetVertexBufferCount }, +{"rsnMeshGetIndexCount", "(II)I", (void*)nMeshGetIndexCount }, +{"rsnMeshGetVertices", "(II[II)V", (void*)nMeshGetVertices }, +{"rsnMeshGetIndices", "(II[I[II)V", (void*)nMeshGetIndices }, }; @@ -1510,3 +1509,4 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) bail: return result; } + |