summaryrefslogtreecommitdiffstats
path: root/graphics/jni
diff options
context:
space:
mode:
authorShih-wei Liao <sliao@google.com>2010-12-10 01:03:59 -0800
committerShih-wei Liao <sliao@google.com>2010-12-14 11:17:20 -0800
commit6b32fab1dbfd8bc1cc176557fe0a7b2ebd4966bd (patch)
tree49b2bdb6cec0af7f5e0131c8d17d88d365382b8a /graphics/jni
parent2bc248b698b17fd333beae828039a8bff7604a9f (diff)
downloadframeworks_base-6b32fab1dbfd8bc1cc176557fe0a7b2ebd4966bd.zip
frameworks_base-6b32fab1dbfd8bc1cc176557fe0a7b2ebd4966bd.tar.gz
frameworks_base-6b32fab1dbfd8bc1cc176557fe0a7b2ebd4966bd.tar.bz2
1. Add Context to a RenderScript or RenderScriptGL instance.
This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. 2. Plumbing, testing. 3. Added getApplicationContext in RenderScript.java. Change-Id: I85edeebe38825e20b2e86f4f4815689dfc332ef9
Diffstat (limited to 'graphics/jni')
-rw-r--r--graphics/jni/android_renderscript_RenderScript.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index 04a7b41..a8343b3 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -902,11 +902,15 @@ exit:
}
static jint
-nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, jstring resName)
+nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, jstring resName, jstring cacheDir)
{
LOG_API("nScriptCCreate, con(%p)", con);
const char* resNameUTF = _env->GetStringUTFChars(resName, NULL);
- return (jint)rsScriptCCreate(con, resNameUTF);
+ const char* cacheDirUTF = _env->GetStringUTFChars(cacheDir, NULL);
+ jint i = (jint)rsScriptCCreate(con, resNameUTF, cacheDirUTF);
+ _env->ReleaseStringUTFChars(resName, resNameUTF);
+ _env->ReleaseStringUTFChars(cacheDir, cacheDirUTF);
+ return i;
}
// ---------------------------------------------------------------------------
@@ -1297,7 +1301,7 @@ static JNINativeMethod methods[] = {
{"rsnScriptCBegin", "(I)V", (void*)nScriptCBegin },
{"rsnScriptCSetScript", "(I[BII)V", (void*)nScriptCSetScript },
-{"rsnScriptCCreate", "(ILjava/lang/String;)I", (void*)nScriptCCreate },
+{"rsnScriptCCreate", "(ILjava/lang/String;Ljava/lang/String;)I", (void*)nScriptCCreate },
{"rsnProgramStoreBegin", "(III)V", (void*)nProgramStoreBegin },
{"rsnProgramStoreDepthFunc", "(II)V", (void*)nProgramStoreDepthFunc },
@@ -1372,4 +1376,3 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
bail:
return result;
}
-