diff options
| author | Jason Sams <jsams@google.com> | 2015-03-11 21:06:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-11 21:06:53 +0000 |
| commit | bb8c910fc12f304c97c94ee86a3a3da56afe8374 (patch) | |
| tree | 38ba00f79cfd145c900c918d17182966766fad78 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | 6c881ec9d588202172c45f3152c15fe0069b0ebb (diff) | |
| parent | d2e4a166ebae4dcf0a9d6cb186283739443b0803 (diff) | |
am d2e4a166: Merge "Remove dead path code"
* commit 'd2e4a166ebae4dcf0a9d6cb186283739443b0803':
Remove dead path code
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -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 f2c9d3196587..6d6757dfed7d 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -1315,7 +1315,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); } @@ -2184,18 +2184,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) { @@ -2444,7 +2432,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 }, |