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

Fix Allocation-less launches

Browse Source 
Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
This commit is contained in:
Jason Sams
2015-04-16 15:13:52 -07:00
parent 7f72f74766
commit bc5c64b725
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rs/java/android/renderscript/Script.java
View File

@@ -184,9 +184,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;

4
rs/jni/android_renderscript_RenderScript.cpp
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
#define LOG_TAG "libRS_jni"
#define LOG_TAG "RenderScript_jni"
#include <stdlib.h>
#include <stdio.h>
@@ -1756,7 +1756,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;