commit 667fb848aa7f457adcfb5fd083309340dc1bf718
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 df95882ad7fd6d2d1bc0a48e8fcb129d0b6564ad
parent c32dd5f2d12107f3f1eff26dfd55a42d49c337de

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

Change-Id: Ib1565efe1353ed788a3ed3c81c6067e92d8ef0e5

libs/rs/rsScriptC.cpp

diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp
index 507430d..0ae85cb 100644
--- a/libs/rs/rsScriptC.cpp
+++ b/libs/rs/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);