commit ff8ce9cd935cd03ec8a7c564b7cf06783c8f8c73
author Shih-wei Liao <sliao@google.com> Thu Dec 16 04:58:35 2010 -0800
committer Shih-wei Liao <sliao@google.com> Thu Dec 16 04:58:35 2010 -0800
tree aab30eff08b335a2319b0f6cce18123200210c26
parent a2aab8be7a980791fc9d4e6c4d050d703b20bcf6

Whenever LoadBinary fails, recompile. Fixing the multi-instance bug.

Change-Id: Ib1565efe1353ed788a3ed3c81c6067e92d8ef0e5

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 507430d..0ae85cb 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -420,7 +420,14 @@
         } else {
           // bccReadBC returns a neagative value: Didn't read any script,
           // So, use cached binary instead
-          bccLoadBinary(s->mBccScript);
+          if (bccLoadBinary(s->mBccScript)) {  // LoadBinary fails ==> Recompile
+            bccReadBC(s->mBccScript,
+                      s->mEnviroment.mScriptText,
+                      s->mEnviroment.mScriptTextLength,
+                      NULL,
+                      cacheDir);
+            bccCompileBC(s->mBccScript);
+          }
         }
         bccGetScriptLabel(s->mBccScript, "root", (BCCvoid**) &s->mProgram.mRoot);
         bccGetScriptLabel(s->mBccScript, "init", (BCCvoid**) &s->mProgram.mInit);