Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a250f20b authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Delete legacy setDefine API."

parents 14d8db96 ec67275e

graphics/jni/android_renderscript_RenderScript.cpp

+0 −20
Original line number Diff line number Diff line
@@ -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

libs/rs/rs.spec

+0 −9
Original line number Diff line number Diff line
@@ -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

libs/rs/rsScriptC.cpp

+0 −10
Original line number Diff line number Diff line
@@ -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");

}



}

}