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

Commit 536923df authored by Jason Sams's avatar Jason Sams
Browse files

Split ScriptC Lib into CL, GL, and basic. 

Change-Id: Iadab35f2a967a1afd7a2fd13216d0a7acf4b6a50
parent c378dab0

libs/rs/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ LOCAL_SRC_FILES:= \ 
	rsScript.cpp \

	rsScriptC.cpp \

	rsScriptC_Lib.cpp \

	rsScriptC_LibCL.cpp \

	rsScriptC_LibGL.cpp \

    rsShaderCache.cpp \

	rsSignal.cpp \

	rsSimpleMesh.cpp \

libs/rs/rsScriptC.cpp

+11 −1
Original line number Diff line number Diff line
@@ -152,7 +152,16 @@ void ScriptCState::clear() 


static BCCvoid* symbolLookup(BCCvoid* pContext, const BCCchar* name)

{

    const ScriptCState::SymbolTable_t *sym = ScriptCState::lookupSymbol(name);

    const ScriptCState::SymbolTable_t *sym;

    sym = ScriptCState::lookupSymbol(name);

    if (sym) {

        return sym->mPtr;

    }

    sym = ScriptCState::lookupSymbolCL(name);

    if (sym) {

        return sym->mPtr;

    }

    sym = ScriptCState::lookupSymbolGL(name);

    if (sym) {

        return sym->mPtr;

    }
@@ -207,6 +216,7 @@ void ScriptCState::runCompiler(Context *rsc, ScriptC *s) 
        bccGetPragmas(s->mBccScript, &pragmaCount, pragmaMax, &str[0]);



        for (int ct=0; ct < pragmaCount; ct+=2) {

            //LOGE("pragme %s %s", str[ct], str[ct+1]);

            if (!strcmp(str[ct], "version")) {

                continue;

            }

libs/rs/rsScriptC.h

+3 −1
Original line number Diff line number Diff line
@@ -78,8 +78,10 @@ public: 
        const char * mName;

        void * mPtr;

    };

    static SymbolTable_t gSyms[];

    //static SymbolTable_t gSyms[];

    static const SymbolTable_t * lookupSymbol(const char *);

    static const SymbolTable_t * lookupSymbolCL(const char *);

    static const SymbolTable_t * lookupSymbolGL(const char *);

};

libs/rs/rsScriptC_Lib.cpp

+1 −695

File changed.

Preview size limit exceeded, changes collapsed.

libs/rs/rsScriptC_LibCL.cpp

0 → 100644
+314 −0

File added.

Preview size limit exceeded, changes collapsed.