summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-05-14 16:51:22 -0700
committer Jason Sams <rjsams@android.com> 2010-05-14 16:51:22 -0700
commitec67275e5f7edb2fe4e6f76ab8b4e01e8990bc92 (patch)
tree64f9f7040afae6890e966387cef6f848d18f7349
parentb42315d37ab22e64ef88d3aed38ed75fd7071eed (diff)
Delete legacy setDefine API.
Change-Id: I1bae13533ab9efea3d3b0ebb6a3711343e922f8a
-rw-r--r--graphics/jni/android_renderscript_RenderScript.cpp20
-rw-r--r--libs/rs/rs.spec9
-rw-r--r--libs/rs/rsScriptC.cpp10
3 files changed, 0 insertions, 39 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index 00e626463d78..65a6e6dd7a7b 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -1019,26 +1019,6 @@ nScriptCCreate(JNIEnv *_env, jobject _this)
return (jint)rsScriptCCreate(con);
}
-static void
-nScriptCAddDefineI32(JNIEnv *_env, jobject _this, jstring name, jint value)
-{
- RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
- const char* n = _env->GetStringUTFChars(name, NULL);
- LOG_API("nScriptCAddDefineI32, con(%p) name(%s) value(%d)", con, n, value);
- rsScriptCSetDefineI32(con, n, value);
- _env->ReleaseStringUTFChars(name, n);
-}
-
-static void
-nScriptCAddDefineF(JNIEnv *_env, jobject _this, jstring name, jfloat value)
-{
- RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
- const char* n = _env->GetStringUTFChars(name, NULL);
- LOG_API("nScriptCAddDefineF, con(%p) name(%s) value(%f)", con, n, value);
- rsScriptCSetDefineF(con, n, value);
- _env->ReleaseStringUTFChars(name, n);
-}
-
// ---------------------------------------------------------------------------
static void
diff --git a/libs/rs/rs.spec b/libs/rs/rs.spec
index 9c57e6679a04..2aa12da19104 100644
--- a/libs/rs/rs.spec
+++ b/libs/rs/rs.spec
@@ -332,15 +332,6 @@ ScriptCCreate {
ret RsScript
}
-ScriptCSetDefineF {
- param const char* name
- param float value
- }
-
-ScriptCSetDefineI32 {
- param const char* name
- param int32_t value
- }
ProgramStoreBegin {
param RsElement in
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 86cda808edaa..e9ba2267a84c 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/rsScriptC.cpp
@@ -298,16 +298,6 @@ RsScript rsi_ScriptCCreate(Context * rsc)
return s;
}
-void rsi_ScriptCSetDefineF(Context *rsc, const char* name, float value)
-{
- LOGE("Error rsi_ScriptCSetDefineF");
-}
-
-void rsi_ScriptCSetDefineI32(Context *rsc, const char* name, int32_t value)
-{
- LOGE("Error rsi_ScriptCSetDefineI");
-}
-
}
}