diff options
author | Yang Ni <yangni@google.com> | 2015-05-05 12:41:19 -0700 |
---|---|---|
committer | Yang Ni <yangni@google.com> | 2015-05-11 11:01:32 -0700 |
commit | 9310e3db455d863cd6d99076120c9e3ae99dee2e (patch) | |
tree | 42e6a54fbb9dc02b61e5541c020f97e7e9ac45ff /rs/jni | |
parent | 3ce72722ca14ad9e84ca54920bb2829696f68d53 (diff) | |
download | frameworks_base-9310e3db455d863cd6d99076120c9e3ae99dee2e.zip frameworks_base-9310e3db455d863cd6d99076120c9e3ae99dee2e.tar.gz frameworks_base-9310e3db455d863cd6d99076120c9e3ae99dee2e.tar.bz2 |
Moved limit constants for kernel and script group
b/20728113
so that we can share them with support lib.
Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40
(cherry picked from commit 7b2a46fee0f95b9ae2485db36e0d279730623c4a)
Diffstat (limited to 'rs/jni')
-rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index a49fb76..1833a1c 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -43,9 +43,6 @@ //#define LOG_API ALOGE static constexpr bool kLogApi = false; -static constexpr size_t kMaxNumberArgsAndBindings = 1000; -static constexpr size_t kMaxNumberClosuresInScriptGroup = 1000000; -static constexpr size_t kMaxNumberKernelArguments = 256; using namespace android; @@ -371,7 +368,7 @@ nClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong kernelID, goto exit; } - if (numValues > kMaxNumberArgsAndBindings) { + if (numValues > RS_CLOSURE_MAX_NUMBER_ARGS_AND_BINDINGS) { ALOGE("Too many arguments or globals in closure creation"); goto exit; } @@ -456,7 +453,7 @@ nInvokeClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong invokeID, numValues = (size_t) fieldIDs_length; - if (numValues > kMaxNumberArgsAndBindings) { + if (numValues > RS_CLOSURE_MAX_NUMBER_ARGS_AND_BINDINGS) { ALOGE("Too many arguments or globals in closure creation"); goto exit; } @@ -521,7 +518,7 @@ nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, jstring name, RsClosure* closures; - if (numClosures > (jsize) kMaxNumberClosuresInScriptGroup) { + if (numClosures > (jsize) RS_SCRIPT_GROUP_MAX_NUMBER_CLOSURES) { ALOGE("Too many closures in script group"); goto exit; } @@ -1867,7 +1864,7 @@ nScriptForEach(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, if (ains != nullptr) { in_len = _env->GetArrayLength(ains); - if (in_len > (jint)kMaxNumberKernelArguments) { + if (in_len > (jint)RS_KERNEL_MAX_ARGUMENTS) { ALOGE("Too many arguments in kernel launch."); // TODO (b/20758983): Report back to Java and throw an exception return; |