Split ProgramFragment and ProgramStore from RenderScript.java. Update Element and Type to new cached builder for easier app developement.
diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 3b9d27a..b0b8404 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -49,7 +49,7 @@
bool ScriptC::run(Context *rsc, uint32_t launchIndex)
{
- Context::ScriptTLSStruct * tls =
+ Context::ScriptTLSStruct * tls =
(Context::ScriptTLSStruct *)pthread_getspecific(Context::gThreadTLSKey);
if (mEnviroment.mFragmentStore.get()) {
@@ -100,7 +100,7 @@
}
-static ACCvoid* symbolLookup(ACCvoid* pContext, const ACCchar* name)
+static ACCvoid* symbolLookup(ACCvoid* pContext, const ACCchar* name)
{
const ScriptCState::SymbolTable_t *sym = ScriptCState::lookupSymbol(name);
if (sym) {
@@ -194,7 +194,7 @@
mEnviroment.mFragmentStore.clear();
continue;
}
- ProgramFragmentStore * pfs =
+ ProgramFragmentStore * pfs =
(ProgramFragmentStore *)rsc->lookupName(str[ct+1]);
if (pfs != NULL) {
mEnviroment.mFragmentStore.set(pfs);
@@ -205,7 +205,7 @@
}
-
+
} else {
// Deal with an error.
}
@@ -221,33 +221,6 @@
ss->clear();
}
-void rsi_ScriptCSetClearColor(Context * rsc, float r, float g, float b, float a)
-{
- ScriptCState *ss = &rsc->mScriptC;
- ss->mEnviroment.mClearColor[0] = r;
- ss->mEnviroment.mClearColor[1] = g;
- ss->mEnviroment.mClearColor[2] = b;
- ss->mEnviroment.mClearColor[3] = a;
-}
-
-void rsi_ScriptCSetTimeZone(Context * rsc, const char * timeZone, uint32_t length)
-{
- ScriptCState *ss = &rsc->mScriptC;
- ss->mEnviroment.mTimeZone = timeZone;
-}
-
-void rsi_ScriptCSetClearDepth(Context * rsc, float v)
-{
- ScriptCState *ss = &rsc->mScriptC;
- ss->mEnviroment.mClearDepth = v;
-}
-
-void rsi_ScriptCSetClearStencil(Context * rsc, uint32_t v)
-{
- ScriptCState *ss = &rsc->mScriptC;
- ss->mEnviroment.mClearStencil = v;
-}
-
void rsi_ScriptCAddType(Context * rsc, RsType vt)
{
ScriptCState *ss = &rsc->mScriptC;