diff options
| author | Jason Sams <rjsams@android.com> | 2009-11-30 14:49:55 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-11-30 15:34:03 -0800 |
| commit | 54c0ec14e016e4a1bf3ceab40ed6ca5447da4725 (patch) | |
| tree | 343acd699d50a4090b451d05135aa7887a6a7984 /graphics/jni | |
| parent | 5154ae7665743b114c71f90dcc577dc50c63b398 (diff) | |
| download | frameworks_base-54c0ec14e016e4a1bf3ceab40ed6ca5447da4725.zip frameworks_base-54c0ec14e016e4a1bf3ceab40ed6ca5447da4725.tar.gz frameworks_base-54c0ec14e016e4a1bf3ceab40ed6ca5447da4725.tar.bz2 | |
Beging GL2 user shaders. Switch master to using GL2 by default.
Diffstat (limited to 'graphics/jni')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index af3bc74..ea5feb8 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -1053,9 +1053,20 @@ nProgramFragmentStoreCreate(JNIEnv *_env, jobject _this) return (jint)rsProgramFragmentStoreCreate(con); } + // --------------------------------------------------------------------------- static void +nProgramFragmentSetShader(JNIEnv *_env, jobject _this, jstring name) +{ + RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); + const char* n = _env->GetStringUTFChars(name, NULL); + LOG_API("nProgramFragmentSetShader, con(%p)", con); + rsProgramFragmentSetShader(con, n, _env->GetStringUTFLength(name)); + _env->ReleaseStringUTFChars(name, n); +} + +static void nProgramFragmentBegin(JNIEnv *_env, jobject _this, jint in, jint out, jboolean pointSpriteEnable) { RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); @@ -1098,6 +1109,17 @@ nProgramFragmentCreate(JNIEnv *_env, jobject _this, jint slot, jboolean enable) // --------------------------------------------------------------------------- static void +nProgramVertexSetShader(JNIEnv *_env, jobject _this, jstring name) +{ + RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); + const char* n = _env->GetStringUTFChars(name, NULL); + LOG_API("nProgramVertexSetShader, con(%p)", con); + rsProgramVertexSetShader(con, n, _env->GetStringUTFLength(name)); + _env->ReleaseStringUTFChars(name, n); +} + + +static void nProgramVertexBegin(JNIEnv *_env, jobject _this, jint in, jint out) { RsContext con = (RsContext)(_env->GetIntField(_this, gContextId)); @@ -1436,6 +1458,7 @@ static JNINativeMethod methods[] = { {"nProgramFragmentBindTexture", "(III)V", (void*)nProgramFragmentBindTexture }, {"nProgramFragmentBindSampler", "(III)V", (void*)nProgramFragmentBindSampler }, {"nProgramFragmentSetSlot", "(IZII)V", (void*)nProgramFragmentSetSlot }, +{"nProgramFragmentSetShader", "(Ljava/lang/String;)V", (void*)nProgramFragmentSetShader }, {"nProgramFragmentCreate", "()I", (void*)nProgramFragmentCreate }, {"nProgramRasterCreate", "(IIZZZ)I", (void*)nProgramRasterCreate }, @@ -1446,6 +1469,7 @@ static JNINativeMethod methods[] = { {"nProgramVertexBegin", "(II)V", (void*)nProgramVertexBegin }, {"nProgramVertexSetTextureMatrixEnable", "(Z)V", (void*)nProgramVertexSetTextureMatrixEnable }, {"nProgramVertexAddLight", "(I)V", (void*)nProgramVertexAddLight }, +{"nProgramVertexSetShader", "(Ljava/lang/String;)V", (void*)nProgramVertexSetShader }, {"nProgramVertexCreate", "()I", (void*)nProgramVertexCreate }, {"nLightBegin", "()V", (void*)nLightBegin }, |