Clean up useless code, logging, and a typo.

Change-Id: I8c2296e7f60037907a969bcaf1746644e32868c3

6 files changed, 9 insertions, 11 deletions

diff --git a/driver/rsdBcc.cpp b/driver/rsdBcc.cpp
index 9225e062..a811cfb7 100644
--- a/driver/rsdBcc.cpp
+++ b/driver/rsdBcc.cpp
@@ -37,7 +37,7 @@ using namespace android;
 using namespace android::renderscript;
 
 struct DrvScript {
-    RsScriptIntrisicID mIntrinsicID;
+    RsScriptIntrinsicID mIntrinsicID;
     int (*mRoot)();
     int (*mRootExpand)();
     void (*mInit)();
@@ -76,8 +76,6 @@ bool rsdScriptInit(const Context *rsc,
 
     pthread_mutex_lock(&rsdgInitMutex);
 
-    const char* coreLib = "/system/lib/libclcore.bc";
-    bcc::RSInfo::FloatPrecision prec;
     bcc::RSExecutable *exec;
     const bcc::RSInfo *info;
     DrvScript *drv = (DrvScript *)calloc(1, sizeof(DrvScript));
@@ -169,7 +167,7 @@ error:
 
 }
 
-bool rsdInitIntrinsic(const Context *rsc, Script *s, RsScriptIntrisicID iid, Element *e) {
+bool rsdInitIntrinsic(const Context *rsc, Script *s, RsScriptIntrinsicID iid, Element *e) {
     pthread_mutex_lock(&rsdgInitMutex);
 
     DrvScript *drv = (DrvScript *)calloc(1, sizeof(DrvScript));
@@ -283,7 +281,7 @@ void rsdScriptInvokeForEach(const Context *rsc,
     MTLaunchStruct mtls;
     memset(&mtls, 0, sizeof(mtls));
 
-    ALOGE("for each script %p  in %p   out %p", s, ain, aout);
+    //ALOGE("for each script %p  in %p   out %p", s, ain, aout);
 
     DrvScript *drv = (DrvScript *)s->mHal.drv;
 
diff --git a/driver/rsdBcc.h b/driver/rsdBcc.h
index 8b91e93b..114e6cfa 100644
--- a/driver/rsdBcc.h
+++ b/driver/rsdBcc.h
@@ -26,7 +26,7 @@ bool rsdScriptInit(const android::renderscript::Context *, android::renderscript
                    uint8_t const *bitcode, size_t bitcodeSize, uint32_t flags);
 bool rsdInitIntrinsic(const android::renderscript::Context *rsc,
                       android::renderscript::Script *s,
-                      RsScriptIntrisicID iid,
+                      RsScriptIntrinsicID iid,
                       android::renderscript::Element *e);
 
 void rsdScriptInvokeFunction(const android::renderscript::Context *dc,
diff --git a/rsDefines.h b/rsDefines.h
index 466469f6..c3540f19 100644
--- a/rsDefines.h
+++ b/rsDefines.h
@@ -333,7 +333,7 @@ enum RsCullMode {
     RS_CULL_INVALID = 100,
 };
 
-enum RsScriptIntrisicID {
+enum RsScriptIntrinsicID {
     RS_SCRIPT_INTRINSIC_ID_UNDEFINED = 0,
     RS_SCRIPT_INTRINSIC_ID_CONVOLVE_3x3 = 1,
     RS_SCRIPT_INTRINSIC_ID_CONVOLVE_5x5 = 2
diff --git a/rsScriptIntrinsic.cpp b/rsScriptIntrinsic.cpp
index 8e48d419..d7325762 100644
--- a/rsScriptIntrinsic.cpp
+++ b/rsScriptIntrinsic.cpp
@@ -27,7 +27,7 @@ ScriptIntrinsic::ScriptIntrinsic(Context *rsc) : Script(rsc) {
 ScriptIntrinsic::~ScriptIntrinsic() {
 }
 
-bool ScriptIntrinsic::init(Context *rsc, RsScriptIntrisicID iid, Element *e) {
+bool ScriptIntrinsic::init(Context *rsc, RsScriptIntrinsicID iid, Element *e) {
     mIntrinsicID = iid;
     mElement.set(e);
     rsc->mHal.funcs.script.initIntrinsic(rsc, this, iid, e);
@@ -78,7 +78,7 @@ namespace renderscript {
 RsScript rsi_ScriptIntrinsicCreate(Context *rsc, uint32_t id, RsElement ve) {
     ScriptIntrinsic *si = new ScriptIntrinsic(rsc);
     ALOGE("rsi_ScriptIntrinsicCreate %i", id);
-    if (!si->init(rsc, (RsScriptIntrisicID)id, (Element *)ve)) {
+    if (!si->init(rsc, (RsScriptIntrinsicID)id, (Element *)ve)) {
         delete si;
         return NULL;
     }
diff --git a/rsScriptIntrinsic.h b/rsScriptIntrinsic.h
index 76d8f2be..310cbec1 100644
--- a/rsScriptIntrinsic.h
+++ b/rsScriptIntrinsic.h
@@ -33,7 +33,7 @@ public:
     ScriptIntrinsic(Context *);
     virtual ~ScriptIntrinsic();
 
-    bool init(Context *rsc, RsScriptIntrisicID iid, Element *e);
+    bool init(Context *rsc, RsScriptIntrinsicID iid, Element *e);
 
 
     virtual void serialize(Context *rsc, OStream *stream) const;
diff --git a/rs_hal.h b/rs_hal.h
index 16e3309e..c521ef56 100644
--- a/rs_hal.h
+++ b/rs_hal.h
@@ -91,7 +91,7 @@ typedef struct {
                      size_t bitcodeSize,
                      uint32_t flags);
         bool (*initIntrinsic)(const Context *rsc, Script *s,
-                              RsScriptIntrisicID iid,
+                              RsScriptIntrinsicID iid,
                               Element *e);
 
         void (*invokeFunction)(const Context *rsc, Script *s,