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

Commit fb10c16a authored by Alex Sakhartchouk's avatar Alex Sakhartchouk
Browse files

Added ability to set font color. 

Propagating the name of meshes and allocations from native a3d to java

Change-Id: If781f55340b5369459610e5e92ea69e240dcd24e
parent cf9a44cd

graphics/java/android/renderscript/Allocation.java

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class Allocation extends BaseObj { 
    @Override

    void updateFromNative() {

        mRS.validate();

        mName = mRS.nGetName(mID);

        int typeID = mRS.nAllocationGetType(mID);

        if(typeID != 0) {

            mType = new Type(typeID, mRS);

graphics/java/android/renderscript/Mesh.java

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ public class Mesh extends BaseObj { 


    @Override

    void updateFromNative() {

        mName = mRS.nGetName(mID);

        int vtxCount = mRS.nMeshGetVertexBufferCount(mID);

        int idxCount = mRS.nMeshGetIndexCount(mID);

graphics/java/android/renderscript/RenderScript.java

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class RenderScript { 
    native void nContextDeinitToClient();



    native void nAssignName(int obj, byte[] name);

    native String nGetName(int obj);

    native void nObjDestroy(int id);

    native void nObjDestroyOOB(int id);

    native int  nFileOpen(byte[] name);

graphics/jni/android_renderscript_RenderScript.cpp

+12 −0
Original line number Diff line number Diff line
@@ -104,6 +104,17 @@ nAssignName(JNIEnv *_env, jobject _this, jint obj, jbyteArray str) 
    _env->ReleasePrimitiveArrayCritical(str, cptr, JNI_ABORT);

}



static jstring

nGetName(JNIEnv *_env, jobject _this, jint obj)

{

    RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));

    LOG_API("nGetName, con(%p), obj(%p)", con, (void *)obj);



    const char *name = NULL;

    rsGetName(con, (void *)obj, &name);

    return _env->NewStringUTF(name);

}



static void

nObjDestroy(JNIEnv *_env, jobject _this, jint obj)

{
@@ -1518,6 +1529,7 @@ static JNINativeMethod methods[] = { 
{"nContextPause",                  "()V",                                  (void*)nContextPause },

{"nContextResume",                 "()V",                                  (void*)nContextResume },

{"nAssignName",                    "(I[B)V",                               (void*)nAssignName },

{"nGetName",                       "(I)Ljava/lang/String;",               (void*)nGetName },

{"nObjDestroy",                    "(I)V",                                 (void*)nObjDestroy },

{"nObjDestroyOOB",                 "(I)V",                                 (void*)nObjDestroyOOB },

{"nContextGetMessage",             "([IZ)I",                               (void*)nContextGetMessage },

libs/rs/rs.spec

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ AssignName { 
	param size_t len

	}



GetName {

	param void *obj

	param const char **name

	}



ObjDestroy {

	param void *obj

	}