Move call to compiler from jni to core library code.
diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 36019ab..be0191b 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -28,6 +28,8 @@
{
mAccScript = NULL;
mScript = NULL;
+ mScriptText = NULL;
+ mScriptTextLength = 0;
}
ScriptC::~ScriptC()
@@ -418,6 +420,21 @@
mScript = NULL;
mIsRoot = false;
mIsOrtho = true;
+ mScriptText = NULL;
+ mScriptTextLength = 0;
+}
+
+void ScriptCState::runCompiler()
+{
+ mAccScript = accCreateScript();
+
+ LOGE("Compiler 1");
+ const char* scriptSource[] = {mScriptText};
+ int scriptLength[] = {mScriptTextLength} ;
+ accScriptSource(mAccScript, 1, scriptSource, scriptLength);
+ accCompileScript(mAccScript);
+ accGetScriptLabel(mAccScript, "main", (ACCvoid**) &mScript);
+ LOGE("Compiler 1");
}
namespace android {
@@ -475,10 +492,20 @@
ss->mIsOrtho = isOrtho;
}
+void rsi_ScriptCSetText(Context *rsc, const char *text, uint32_t len)
+{
+ ScriptCState *ss = &rsc->mScriptC;
+ ss->mScriptText = text;
+ ss->mScriptTextLength = len;
+}
+
+
RsScript rsi_ScriptCCreate(Context * rsc)
{
ScriptCState *ss = &rsc->mScriptC;
+ ss->runCompiler();
+
ScriptC *s = new ScriptC();
s->mAccScript = ss->mAccScript;
ss->mAccScript = NULL;
@@ -491,7 +518,8 @@
s->mClearStencil = ss->mClearStencil;
s->mIsRoot = ss->mIsRoot;
s->mIsOrtho = ss->mIsOrtho;
-
+ s->mScriptText = ss->mScriptText;
+ s->mScriptTextLength = ss->mScriptTextLength;
return s;
}