Fix isObject when in 64bit mode.

This also cleans up the passing of args to SetObject and ClearObject.
Fix related issues in 64bit teardown.

Change-Id: I90d1b93c45ff5bc84957d5441ab48a4e2f6feb20

1 files changed, 5 insertions, 5 deletions

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index d6e0c4b0..a11fda19 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -1249,7 +1249,7 @@ void RsdCpuScriptImpl::setGlobalObj(uint32_t slot, ObjectBase *data) {
         return;
     }
 
-    rsrSetObject(mCtx->getContext(), (ObjectBase **)destPtr, data);
+    rsrSetObject(mCtx->getContext(), (rs_object_base *)destPtr, data);
 }
 
 RsdCpuScriptImpl::~RsdCpuScriptImpl() {
@@ -1269,8 +1269,8 @@ RsdCpuScriptImpl::~RsdCpuScriptImpl() {
                (is_object_iter != is_object_end)) {
             // The field address can be NULL if the script-side has optimized
             // the corresponding global variable away.
-            ObjectBase **obj_addr =
-                reinterpret_cast<ObjectBase **>(*var_addr_iter);
+            rs_object_base *obj_addr =
+                reinterpret_cast<rs_object_base *>(*var_addr_iter);
             if (*is_object_iter) {
                 if (*var_addr_iter != NULL && mCtx->getContext() != NULL) {
                     rsrClearObject(mCtx->getContext(), obj_addr);
@@ -1302,8 +1302,8 @@ RsdCpuScriptImpl::~RsdCpuScriptImpl() {
         for (size_t i = 0; i < mExportedVariableCount; ++i) {
             if (mFieldIsObject[i]) {
                 if (mFieldAddress[i] != NULL) {
-                    ObjectBase **obj_addr =
-                        reinterpret_cast<ObjectBase **>(mFieldAddress[i]);
+                    rs_object_base *obj_addr =
+                        reinterpret_cast<rs_object_base *>(mFieldAddress[i]);
                     rsrClearObject(mCtx->getContext(), obj_addr);
                 }
             }