diff options
| author | Jason Sams <jsams@google.com> | 2015-03-13 02:59:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 02:59:40 +0000 |
| commit | 8ab7eb4c02dcebd31194de06cd11c8b056982ad0 (patch) | |
| tree | 612e4adebd28512c5b1e7ae8a9e1022a7c16ed43 /rs/jni | |
| parent | 942c474820550e38b652310003023fe1a8246d19 (diff) | |
| parent | bb8c910fc12f304c97c94ee86a3a3da56afe8374 (diff) | |
| download | frameworks_base-8ab7eb4c02dcebd31194de06cd11c8b056982ad0.zip frameworks_base-8ab7eb4c02dcebd31194de06cd11c8b056982ad0.tar.gz frameworks_base-8ab7eb4c02dcebd31194de06cd11c8b056982ad0.tar.bz2 | |
am bb8c910f: am d2e4a166: Merge "Remove dead path code"
* commit 'bb8c910fc12f304c97c94ee86a3a3da56afe8374':
Remove dead path code
Diffstat (limited to 'rs/jni')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 8483507..59161e7 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1310,7 +1310,7 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jbyte *ptr = _env->GetByteArrayElements(data, nullptr); rsAllocationElementRead((RsContext)con, (RsAllocation)alloc, xoff, yoff, zoff, - lod, ptr, sizeBytes, compIdx); + lod, ptr, sizeBytes, compIdx); _env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); } @@ -2179,18 +2179,6 @@ nSamplerCreate(JNIEnv *_env, jobject _this, jlong con, jint magFilter, jint minF // --------------------------------------------------------------------------- static jlong -nPathCreate(JNIEnv *_env, jobject _this, jlong con, jint prim, jboolean isStatic, jlong _vtx, jlong _loop, jfloat q) { - if (kLogApi) { - ALOGD("nPathCreate, con(%p)", (RsContext)con); - } - - jlong id = (jlong)(uintptr_t)rsPathCreate((RsContext)con, (RsPathPrimitive)prim, isStatic, - (RsAllocation)_vtx, - (RsAllocation)_loop, q); - return id; -} - -static jlong nMeshCreate(JNIEnv *_env, jobject _this, jlong con, jlongArray _vtx, jlongArray _idx, jintArray _prim) { if (kLogApi) { @@ -2439,7 +2427,6 @@ static JNINativeMethod methods[] = { {"rsnSamplerCreate", "(JIIIIIF)J", (void*)nSamplerCreate }, -{"rsnPathCreate", "(JIZJJF)J", (void*)nPathCreate }, {"rsnMeshCreate", "(J[J[J[I)J", (void*)nMeshCreate }, {"rsnMeshGetVertexBufferCount", "(JJ)I", (void*)nMeshGetVertexBufferCount }, |