commit 1ffd86b448d78366190c540f98f8b6d641cdb6cf
author Yang Ni <yangni@google.com> Wed Jan 07 09:16:40 2015 -0800
committer Yang Ni <yangni@google.com> Wed Jan 07 09:16:40 2015 -0800
tree 65dc9b2f0c6d53ce4858ae990ab82f34cc26fd06
parent 82f515b5a40d030f88bf622b8c05a03ec80083ee

New Script Group API: runtime and cpu driver support.

Change-Id: I9c612cf8874aabaf0ca7d1640567464c71ed3070

rsScriptGroup.cpp

diff --git a/rsScriptGroup.cpp b/rsScriptGroup.cpp
index 618c28c..791ab14 100644
--- a/rsScriptGroup.cpp
+++ b/rsScriptGroup.cpp
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-#include <algorithm>
+#include "rsScriptGroup.h"
 
 #include "rsContext.h"
+#include "rsScriptGroup2.h"
+
+#include <algorithm>
 #include <time.h>
 
 using namespace android;
 using namespace android::renderscript;
 
-ScriptGroup::ScriptGroup(Context *rsc) : ObjectBase(rsc) {
+ScriptGroup::ScriptGroup(Context *rsc) : ScriptGroupBase(rsc) {
 }
 
 ScriptGroup::~ScriptGroup() {
@@ -270,12 +273,10 @@
 }
 
 void ScriptGroup::execute(Context *rsc) {
-
     if (!validateInputAndOutput(rsc)) {
         return;
     }
 
-    //ALOGE("ScriptGroup::execute");
     if (rsc->mHal.funcs.scriptgroup.execute) {
         rsc->mHal.funcs.scriptgroup.execute(rsc, this);
         return;
@@ -324,13 +325,6 @@
 
 }
 
-void ScriptGroup::serialize(Context *rsc, OStream *stream) const {
-}
-
-RsA3DClassID ScriptGroup::getClassId() const {
-    return RS_A3D_CLASS_ID_SCRIPT_GROUP;
-}
-
 ScriptGroup::Link::Link() {
 }
 
@@ -371,7 +365,7 @@
 }
 
 void rsi_ScriptGroupExecute(Context *rsc, RsScriptGroup sg) {
-    ScriptGroup *s = (ScriptGroup *)sg;
+    ScriptGroupBase *s = (ScriptGroupBase *)sg;
     s->execute(rsc);
 }