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

driver/rsdScriptGroup.cpp

diff --git a/driver/rsdScriptGroup.cpp b/driver/rsdScriptGroup.cpp
index a7b2e77..ed800a3 100644
--- a/driver/rsdScriptGroup.cpp
+++ b/driver/rsdScriptGroup.cpp
@@ -28,7 +28,7 @@
 using namespace android::renderscript;
 
 
-bool rsdScriptGroupInit(const Context *rsc, ScriptGroup *sg) {
+bool rsdScriptGroupInit(const Context *rsc, ScriptGroupBase *sg) {
     RsdHal *dc = (RsdHal *)rsc->mHal.drv;
 
     sg->mHal.drv = dc->mCpuRef->createScriptGroup(sg);
@@ -43,13 +43,15 @@
                              const ScriptKernelID *kid, Allocation *) {
 }
 
-void rsdScriptGroupExecute(const Context *rsc, const ScriptGroup *sg) {
-    RsdCpuReference::CpuScriptGroup *sgi = (RsdCpuReference::CpuScriptGroup *)sg->mHal.drv;
+void rsdScriptGroupExecute(const Context *rsc, const ScriptGroupBase *sg) {
+    RsdCpuReference::CpuScriptGroupBase *sgi =
+        (RsdCpuReference::CpuScriptGroupBase *)sg->mHal.drv;
     sgi->execute();
 }
 
-void rsdScriptGroupDestroy(const Context *rsc, const ScriptGroup *sg) {
-    RsdCpuReference::CpuScriptGroup *sgi = (RsdCpuReference::CpuScriptGroup *)sg->mHal.drv;
+void rsdScriptGroupDestroy(const Context *rsc, const ScriptGroupBase *sg) {
+    RsdCpuReference::CpuScriptGroupBase *sgi =
+        (RsdCpuReference::CpuScriptGroupBase *)sg->mHal.drv;
     delete sgi;
 }
 
@@ -68,5 +70,3 @@
     obj->v2 = nullptr;
 #endif
 }
-
-

driver/rsdScriptGroup.h

diff --git a/driver/rsdScriptGroup.h b/driver/rsdScriptGroup.h
index db44e23..95e5d19 100644
--- a/driver/rsdScriptGroup.h
+++ b/driver/rsdScriptGroup.h
@@ -20,7 +20,7 @@
 #include <rs_hal.h>
 
 bool rsdScriptGroupInit(const android::renderscript::Context *rsc,
-                        android::renderscript::ScriptGroup *sg);
+                        android::renderscript::ScriptGroupBase *sg);
 void rsdScriptGroupSetInput(const android::renderscript::Context *rsc,
                             const android::renderscript::ScriptGroup *sg,
                             const android::renderscript::ScriptKernelID *kid,
@@ -30,9 +30,9 @@
                              const android::renderscript::ScriptKernelID *kid,
                              android::renderscript::Allocation *);
 void rsdScriptGroupExecute(const android::renderscript::Context *rsc,
-                           const android::renderscript::ScriptGroup *sg);
+                           const android::renderscript::ScriptGroupBase *sg);
 void rsdScriptGroupDestroy(const android::renderscript::Context *rsc,
-                           const android::renderscript::ScriptGroup *sg);
+                           const android::renderscript::ScriptGroupBase *sg);
 void rsdScriptGroupUpdateCachedObject(const android::renderscript::Context *rsc,
                                       const android::renderscript::ScriptGroup *sg,
                                       android::renderscript::rs_script_group *obj);