diff options
| author | Jason Sams <jsams@google.com> | 2015-05-05 18:00:34 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2015-05-05 18:00:34 -0700 |
| commit | d1516dffa8d676fcad092d9736163829e6d0fdce (patch) | |
| tree | 14fd6780659583b86cbc27ce8299768bfff0b2c8 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b (diff) | |
| download | frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.zip frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.tar.gz frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.tar.bz2 | |
Fix Allocation-less launches
Cherry-pick fix from AOSP. Error check for kernel launch was
generating a false positive.
bug 20690242
Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index 80d6515..58d0fce 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "libRS_jni" +#define LOG_TAG "RenderScript_jni" #include <stdlib.h> #include <stdio.h> @@ -1857,7 +1857,7 @@ nScriptForEach(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, jintArray limits) { if (kLogApi) { - ALOGD("nScriptForEach, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot); + ALOGD("nScriptForEach, con(%p), s(%p), slot(%i) ains(%p) aout(%lli)", (RsContext)con, (void *)script, slot, ains, aout); } jint in_len = 0; |