commit 93eacc7ce0aad4314b4cb41a281f59ce54bb3286
author Jason Sams <jsams@google.com> Tue Dec 18 14:26:57 2012 -0800
committer Stephen Hines <srhines@google.com> Wed Dec 19 15:26:29 2012 -0800
tree 680d89e22de38ebba5315d132f4d3ec645a40e50
parent 38ac5d4092f32b08451c73ecabcf2ab21aef15d5

Cleanup diff with compat.

Change-Id: Ieedcdec03ccb05cac68cbebbd398e07cb885f4d3

rsScriptC.cpp

diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index 18e4af2..757d3ca 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -19,10 +19,12 @@
 #include "utils/Timers.h"
 #include "utils/StopWatch.h"
 
+#ifndef RS_COMPATIBILITY_LIB
 #ifndef ANDROID_RS_SERIALIZE
 #include <bcinfo/BitcodeTranslator.h>
 #include <bcinfo/BitcodeWrapper.h>
 #endif
+#endif
 
 #include <sys/stat.h>
 
@@ -35,24 +37,29 @@
     ScriptC * sc = (ScriptC *) tls->mScript
 
 ScriptC::ScriptC(Context *rsc) : Script(rsc) {
+#ifndef RS_COMPATIBILITY_LIB
 #ifndef ANDROID_RS_SERIALIZE
     BT = NULL;
 #endif
+#endif
 }
 
 ScriptC::~ScriptC() {
+#ifndef RS_COMPATIBILITY_LIB
 #ifndef ANDROID_RS_SERIALIZE
     if (BT) {
         delete BT;
         BT = NULL;
     }
 #endif
+#endif
     if (mInitialized) {
         mRSC->mHal.funcs.script.invokeFreeChildren(mRSC, this);
         mRSC->mHal.funcs.script.destroy(mRSC, this);
     }
 }
 
+#ifndef RS_COMPATIBILITY_LIB
 bool ScriptC::createCacheDir(const char *cacheDir) {
     String8 cacheDirString, currentDir;
     struct stat statBuf;
@@ -89,6 +96,7 @@
     }
     return true;
 }
+#endif
 
 void ScriptC::setupScript(Context *rsc) {
     mEnviroment.mStartTimeMillis
@@ -106,6 +114,7 @@
 }
 
 void ScriptC::setupGLState(Context *rsc) {
+#ifndef RS_COMPATIBILITY_LIB
     if (mEnviroment.mFragmentStore.get()) {
         rsc->setProgramStore(mEnviroment.mFragmentStore.get());
     }
@@ -118,6 +127,7 @@
     if (mEnviroment.mRaster.get()) {
         rsc->setProgramRaster(mEnviroment.mRaster.get());
     }
+#endif
 }
 
 uint32_t ScriptC::run(Context *rsc) {
@@ -217,6 +227,7 @@
                           size_t bitcodeLen) {
 
     //ALOGE("runCompiler %p %p %p %p %p %i", rsc, this, resName, cacheDir, bitcode, bitcodeLen);
+#ifndef RS_COMPATIBILITY_LIB
 #ifndef ANDROID_RS_SERIALIZE
     uint32_t sdkVersion = 0;
     bcinfo::BitcodeWrapper bcWrapper((const char *)bitcode, bitcodeLen);
@@ -260,16 +271,19 @@
     if (cacheDir && !createCacheDir(cacheDir)) {
       return false;
     }
+#endif
 
     if (!rsc->mHal.funcs.script.init(rsc, this, resName, cacheDir, bitcode, bitcodeLen, 0)) {
         return false;
     }
 
     mInitialized = true;
+#ifndef RS_COMPATIBILITY_LIB
     mEnviroment.mFragment.set(rsc->getDefaultProgramFragment());
     mEnviroment.mVertex.set(rsc->getDefaultProgramVertex());
     mEnviroment.mFragmentStore.set(rsc->getDefaultProgramStore());
     mEnviroment.mRaster.set(rsc->getDefaultProgramRaster());
+#endif
 
     rsc->mHal.funcs.script.invokeInit(rsc, this);
 
@@ -285,6 +299,7 @@
             return false;
         }
 
+#ifndef RS_COMPATIBILITY_LIB
         if (!strcmp(key, "stateVertex")) {
             if (!strcmp(value, "default")) {
                 continue;
@@ -332,6 +347,8 @@
             ALOGE("Unrecognized value %s passed to stateStore", value);
             return false;
         }
+#endif
+
     }
 
     mSlots = new ObjectBaseRef<Allocation>[mHal.info.exportedVariableCount];