am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

* commit 'ed3ffe0fc86de016ff2b4231e2fcc74a6119f6c7':
  RenderScript: implement a Script entry point for calling a reduce-style kernel.
This commit is contained in:
Stephen Hines
2015-07-23 22:54:59 +00:00
committed by Android Git Automerger
3 changed files with 93 additions and 1 deletions

View File

@@ -1948,6 +1948,59 @@ nScriptForEach(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot,
}
}
static void
nScriptReduce(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot,
jlong ain, jlong aout, jintArray limits)
{
if (kLogApi) {
ALOGD("nScriptReduce, con(%p), s(%p), slot(%i) ain(%" PRId64 ") aout(%" PRId64 ")", (RsContext)con, (void *)script, slot, ain, aout);
}
RsScriptCall sc, *sca = nullptr;
uint32_t sc_size = 0;
jint limit_len = 0;
jint *limit_ptr = nullptr;
// If the caller passed limits, reflect them in the RsScriptCall.
if (limits != nullptr) {
limit_len = _env->GetArrayLength(limits);
limit_ptr = _env->GetIntArrayElements(limits, nullptr);
// We expect to be passed an array [x1, x2] which specifies
// the sub-range for a 1-dimensional reduction.
assert(limit_len == 2);
UNUSED(limit_len); // As the assert might not be compiled.
sc.xStart = limit_ptr[0];
sc.xEnd = limit_ptr[1];
sc.yStart = 0;
sc.yEnd = 0;
sc.zStart = 0;
sc.zEnd = 0;
sc.strategy = RS_FOR_EACH_STRATEGY_DONT_CARE;
sc.arrayStart = 0;
sc.arrayEnd = 0;
sc.array2Start = 0;
sc.array2End = 0;
sc.array3Start = 0;
sc.array3End = 0;
sc.array4Start = 0;
sc.array4End = 0;
sca = ≻
sc_size = sizeof(sc);
}
rsScriptReduce((RsContext)con, (RsScript)script, slot,
(RsAllocation)ain, (RsAllocation)aout,
sca, sc_size);
if (limits != nullptr) {
_env->ReleaseIntArrayElements(limits, limit_ptr, JNI_ABORT);
}
}
// -----------------------------------
static jlong
@@ -2531,6 +2584,7 @@ static JNINativeMethod methods[] = {
{"rsnScriptInvokeV", "(JJI[B)V", (void*)nScriptInvokeV },
{"rsnScriptForEach", "(JJI[JJ[B[I)V", (void*)nScriptForEach },
{"rsnScriptReduce", "(JJIJJ[I)V", (void*)nScriptReduce },
{"rsnScriptSetVarI", "(JJII)V", (void*)nScriptSetVarI },
{"rsnScriptGetVarI", "(JJI)I", (void*)nScriptGetVarI },