diff options
| author | Jason Sams <jsams@google.com> | 2015-05-06 19:40:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 19:40:21 +0000 |
| commit | 22f07f89df69e888ffb9e7b8e498cc8ac5fb282f (patch) | |
| tree | 8d6aaedc6c71ffe53bb8e9649b317fdfde7ad404 | |
| parent | a0511081d037722a89d3d69e7edcd0d0dc6ec965 (diff) | |
| parent | d1516dffa8d676fcad092d9736163829e6d0fdce (diff) | |
| download | frameworks_base-22f07f89df69e888ffb9e7b8e498cc8ac5fb282f.zip frameworks_base-22f07f89df69e888ffb9e7b8e498cc8ac5fb282f.tar.gz frameworks_base-22f07f89df69e888ffb9e7b8e498cc8ac5fb282f.tar.bz2 | |
Merge "Fix Allocation-less launches" into mnc-dev
| -rw-r--r-- | rs/java/android/renderscript/Script.java | 4 | ||||
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 6a1efee..7cd6d09 100644 --- a/rs/java/android/renderscript/Script.java +++ b/rs/java/android/renderscript/Script.java @@ -182,9 +182,9 @@ public class Script extends BaseObj { mRS.validateObject(ain); mRS.validateObject(aout); - if (ain == null && aout == null) { + if (ain == null && aout == null && sc == null) { throw new RSIllegalArgumentException( - "At least one of ain or aout is required to be non-null."); + "At least one of input allocation, output allocation, or LaunchOptions is required to be non-null."); } long[] in_ids = null; 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; |