Merge "Moving libRS"

1 files changed, 0 insertions, 67 deletions

diff --git a/libs/rs/BaseObj.cpp b/libs/rs/BaseObj.cpp
deleted file mode 100644
index 82e51e7..0000000
--- a/libs/rs/BaseObj.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "libRS_cpp"
-
-#include <rs.h>
-
-#include "RenderScript.h"
-#include "BaseObj.h"
-
-void * BaseObj::getID() const {
-    if (mID == NULL) {
-        ALOGE("Internal error: Object id 0.");
-    }
-    return mID;
-}
-
-void * BaseObj::getObjID(const BaseObj *o) {
-    return o == NULL ? NULL : o->getID();
-}
-
-
-BaseObj::BaseObj(void *id, RenderScript *rs) {
-    mRS = rs;
-    mID = id;
-}
-
-void BaseObj::checkValid() {
-    if (mID == 0) {
-        ALOGE("Invalid object.");
-    }
-}
-
-BaseObj::~BaseObj() {
-    rsObjDestroy(mRS->mContext, mID);
-    mRS = NULL;
-    mID = NULL;
-}
-
-void BaseObj::updateFromNative() {
-    const char *name = NULL;
-    rsaGetName(mRS, mID, &name);
-    mName = name;
-}
-
-bool BaseObj::equals(const BaseObj *obj) {
-    // Early-out check to see if both BaseObjs are actually the same
-    if (this == obj)
-        return true;
-    return mID == obj->mID;
-}
-
-
-