diff options
author | Alex Sakhartchouk <alexst@google.com> | 2010-07-02 12:14:26 -0700 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2010-07-02 12:14:26 -0700 |
commit | 8287a9bc5e184f1bbb91866591c4358a3a9eb168 (patch) | |
tree | 55126bd3dfa3cbdb2ccea11476cb55cb7cc8dde8 /graphics/jni | |
parent | 704aba52a8732ac6fffe9551756f86e76864e0a7 (diff) | |
download | frameworks_base-8287a9bc5e184f1bbb91866591c4358a3a9eb168.zip frameworks_base-8287a9bc5e184f1bbb91866591c4358a3a9eb168.tar.gz frameworks_base-8287a9bc5e184f1bbb91866591c4358a3a9eb168.tar.bz2 |
Cleanup pass on the mesh api change.
Removed all the simple mesh related calls and temporary objects.
Change-Id: Ic64a72a894e0314f216f10e1cfc0d45b17e2e182
Diffstat (limited to 'graphics/jni')
-rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index a6d2489..cbc24c4 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -1377,37 +1377,6 @@ nMeshBindIndex(JNIEnv *_env, jobject _this, jint s, jint alloc, jint primID, jin // --------------------------------------------------------------------------- -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; -} - -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), Mesh(%p), Alloc(%p), slot(%i)", con, (RsMesh)s, (RsAllocation)alloc, slot); - rsSimpleMeshBindVertex(con, (RsMesh)s, (RsAllocation)alloc, slot); -} - -static void -nSimpleMeshBindIndex(JNIEnv *_env, jobject _this, jint s, jint alloc) -{ - RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); - LOG_API("nSimpleMeshBindIndex, con(%p), Mesh(%p), Alloc(%p)", con, (RsMesh)s, (RsAllocation)alloc); - rsSimpleMeshBindIndex(con, (RsMesh)s, (RsAllocation)alloc); -} - -// --------------------------------------------------------------------------- - static const char *classPathName = "android/renderscript/RenderScript"; @@ -1536,10 +1505,6 @@ static JNINativeMethod methods[] = { {"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 }, - {"nMeshCreate", "(II)I", (void*)nMeshCreate }, {"nMeshBindVertex", "(III)V", (void*)nMeshBindVertex }, {"nMeshBindIndex", "(IIII)V", (void*)nMeshBindIndex }, |