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

Commit a09a6e14 authored by Jason Sams's avatar Jason Sams
Browse files

More complete support for named attribs. Adds user typed attribs as available... 

More complete support for named attribs.  Adds user typed attribs as available to programVertex.  Non user attribs are not treated like user for GL2 for simplicity.
parent 432bff01

graphics/java/android/renderscript/Element.java

+2 −1
Original line number Diff line number Diff line
@@ -298,7 +298,8 @@ public class Element extends BaseObj { 
              dk == DataKind.POSITION ||

              dk == DataKind.TEXTURE ||

              dk == DataKind.NORMAL ||

              dk == DataKind.POINT_SIZE)) {

              dk == DataKind.POINT_SIZE ||

              dk == DataKind.USER)) {

            throw new IllegalArgumentException("Unsupported DataKind");

        }

libs/rs/RenderScript.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void rsContextInitToClient(RsContext); 
void rsContextDeinitToClient(RsContext);



#define RS_MAX_TEXTURE 2

#define RS_MAX_ATTRIBS 16



enum RsDataType {

    RS_TYPE_NONE,

libs/rs/rsContext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ void * Context::threadProc(void *vrsc) 


     rsc->props.mLogTimes = getProp("debug.rs.profile");

     rsc->props.mLogScripts = getProp("debug.rs.script");

     rsc->props.mLogObjects = getProp("debug.rs.objects");

     rsc->props.mLogShaders = getProp("debug.rs.shaders");

     rsc->props.mLogObjects = getProp("debug.rs.object");

     rsc->props.mLogShaders = getProp("debug.rs.shader");



     ScriptTLSStruct *tlsStruct = new ScriptTLSStruct;

     if (!tlsStruct) {

libs/rs/rsProgram.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public: 
    void bindAllocation(Allocation *);

    virtual void createShader();



    bool isUserProgram() const {return mUserShader.size() > 0;}



    void bindTexture(uint32_t slot, Allocation *);

    void bindSampler(uint32_t slot, Sampler *);

libs/rs/rsProgramFragment.cpp

+2 −2
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) 
    }

    glActiveTexture(GL_TEXTURE0);

    mDirty = false;

    rsc->checkError("ProgramFragment::setupGL");

}



void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, ShaderCache *sc)
@@ -170,8 +171,7 @@ void ProgramFragment::setupGL2(const Context *rsc, ProgramFragmentState *state, 


    glActiveTexture(GL_TEXTURE0);

    mDirty = false;



    //LOGE("sgl2 frag2 %x", glGetError());

    rsc->checkError("ProgramFragment::setupGL2");

}



void ProgramFragment::loadShader(Context *rsc) {