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

Commit 928f5cf2 authored by Jason Sams's avatar Jason Sams
Browse files

Move placement of script enviroment data to base.

parent 3a833d8e

libs/rs/rsContext.cpp

+5 −5
Original line number Diff line number Diff line
@@ -86,11 +86,11 @@ bool Context::runRootScript() 
    glDepthMask(GL_TRUE);

    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);



    glClearColor(mRootScript->mClearColor[0],

                 mRootScript->mClearColor[1],

                 mRootScript->mClearColor[2],

                 mRootScript->mClearColor[3]);

    glClearDepthf(mRootScript->mClearDepth);

    glClearColor(mRootScript->mEnviroment.mClearColor[0],

                 mRootScript->mEnviroment.mClearColor[1],

                 mRootScript->mEnviroment.mClearColor[2],

                 mRootScript->mEnviroment.mClearColor[3]);

    glClearDepthf(mRootScript->mEnviroment.mClearDepth);

    glClear(GL_COLOR_BUFFER_BIT);

    glClear(GL_DEPTH_BUFFER_BIT);

libs/rs/rsScript.cpp

+6 −5
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ using namespace android::renderscript; 


Script::Script()

{

    mClearColor[0] = 0;

    mClearColor[1] = 0;

    mClearColor[2] = 0;

    mClearColor[3] = 1;

    mClearDepth = 1;

    memset(&mEnviroment, 0, sizeof(mEnviroment));

    mEnviroment.mClearColor[0] = 0;

    mEnviroment.mClearColor[1] = 0;

    mEnviroment.mClearColor[2] = 0;

    mEnviroment.mClearColor[3] = 1;

    mEnviroment.mClearDepth = 1;

}



Script::~Script()

libs/rs/rsScript.h

+13 −7
Original line number Diff line number Diff line
@@ -33,13 +33,19 @@ public: 
    virtual ~Script();





    struct Enviroment_t {

        bool mIsRoot;

        bool mIsOrtho;



        float mClearColor[4];

        float mClearDepth;

        uint32_t mClearStencil;



        bool mUseStateVertex;

        bool mUseStateRaster;

        bool mUseStateFragment;

        bool mUseStateStore;

    };

    Enviroment_t mEnviroment;



    const Type * mConstantBufferTypes;

    uint32_t mCounstantBufferCount;

libs/rs/rsScriptC.h

+3 −13
Original line number Diff line number Diff line
@@ -40,24 +40,14 @@ public: 
        const char * mScriptText;

        uint32_t mScriptTextLength;



        bool useStateVertex;

        bool useStateRaster;

        bool useStateFragment;

        bool useStateStore;



        rsc_RunScript mScript;

    };

        int mVersionMajor;

        int mVersionMinor;



    struct Enviroment_t {

        bool mIsRoot;

        bool mIsOrtho;

        float mClearColor[4];

        float mClearDepth;

        uint32_t mClearStencil;

        rsc_RunScript mScript;

    };



    Program_t mProgram;

    Enviroment_t mEnviroment;



    ACCscript*    mAccScript;