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

Merge "Moved limit constants for kernel and script group"

Browse Source
This commit is contained in:
Yang Ni
2015-05-08 17:41:25 +00:00
committed by Gerrit Code Review
parent 809a7645e3 7b2a46fee0
commit 496c07d754
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rs/jni/android_renderscript_RenderScript.cpp
View File

@@ -44,9 +44,6 @@
//#define LOG_API ALOGE //#define LOG_API ALOGE
static constexpr bool kLogApi = false; 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; using namespace android;
@@ -376,7 +373,7 @@ nClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong kernelID,
goto exit; goto exit;
} }
if (numValues > kMaxNumberArgsAndBindings) { if (numValues > RS_CLOSURE_MAX_NUMBER_ARGS_AND_BINDINGS) {
ALOGE("Too many arguments or globals in closure creation"); ALOGE("Too many arguments or globals in closure creation");
goto exit; goto exit;
} }
@@ -461,7 +458,7 @@ nInvokeClosureCreate(JNIEnv *_env, jobject _this, jlong con, jlong invokeID,
numValues = (size_t) fieldIDs_length; 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"); ALOGE("Too many arguments or globals in closure creation");
goto exit; goto exit;
} }
@@ -526,7 +523,7 @@ nScriptGroup2Create(JNIEnv *_env, jobject _this, jlong con, jstring name,
RsClosure* closures; RsClosure* closures;
if (numClosures > (jsize) kMaxNumberClosuresInScriptGroup) { if (numClosures > (jsize) RS_SCRIPT_GROUP_MAX_NUMBER_CLOSURES) {
ALOGE("Too many closures in script group"); ALOGE("Too many closures in script group");
goto exit; goto exit;
} }
@@ -1877,7 +1874,7 @@ nScriptForEach(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot,
if (ains != nullptr) { if (ains != nullptr) {
in_len = _env->GetArrayLength(ains); 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."); ALOGE("Too many arguments in kernel launch.");
// TODO (b/20758983): Report back to Java and throw an exception // TODO (b/20758983): Report back to Java and throw an exception
return; return;