Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 148594a0: Merge "Cleanup logs." into honeycomb

Browse Source 
* commit '148594a0151ddf4978a9d796b5541cca3407fb89':
  Cleanup logs.
This commit is contained in:
Jason Sams
2011-01-18 18:41:04 -08:00
committed by Android Git Automerger
parent e97cc1a286 148594a015
commit 752d2bf9a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/jni/android_renderscript_RenderScript.cpp
View File

@@ -991,7 +991,7 @@ nProgramFragmentCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shade
jint *paramPtr = _env->GetIntArrayElements(params, NULL); jint *paramPtr = _env->GetIntArrayElements(params, NULL);
jint paramLen = _env->GetArrayLength(params); jint paramLen = _env->GetArrayLength(params);
LOG_API("nProgramFragmentCreate, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen); LOG_API("nProgramFragmentCreate, con(%p), paramLen(%i)", con, paramLen);
jint ret = (jint)rsProgramFragmentCreate(con, shaderUTF.c_str(), shaderUTF.length(), (uint32_t *)paramPtr, paramLen); jint ret = (jint)rsProgramFragmentCreate(con, shaderUTF.c_str(), shaderUTF.length(), (uint32_t *)paramPtr, paramLen);
_env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT);
@@ -1008,7 +1008,7 @@ nProgramVertexCreate(JNIEnv *_env, jobject _this, RsContext con, jstring shader,
jint *paramPtr = _env->GetIntArrayElements(params, NULL); jint *paramPtr = _env->GetIntArrayElements(params, NULL);
jint paramLen = _env->GetArrayLength(params); jint paramLen = _env->GetArrayLength(params);
LOG_API("nProgramVertexCreate, con(%p), shaderLen(%i), paramLen(%i)", con, shaderLen, paramLen); LOG_API("nProgramVertexCreate, con(%p), paramLen(%i)", con, paramLen);
jint ret = (jint)rsProgramVertexCreate(con, shaderUTF.c_str(), shaderUTF.length(), (uint32_t *)paramPtr, paramLen); jint ret = (jint)rsProgramVertexCreate(con, shaderUTF.c_str(), shaderUTF.length(), (uint32_t *)paramPtr, paramLen);
_env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT); _env->ReleaseIntArrayElements(params, paramPtr, JNI_ABORT);