Merge "Code cleanup: Remove unused typedefs and declarations."

5 files changed, 0 insertions, 20 deletions

diff --git a/cpu_ref/rsCpuCore.cpp b/cpu_ref/rsCpuCore.cpp
index 8dbf296b..e2d3bf1c 100644
--- a/cpu_ref/rsCpuCore.cpp
+++ b/cpu_ref/rsCpuCore.cpp
@@ -343,11 +343,6 @@ RsdCpuReferenceImpl::~RsdCpuReferenceImpl() {
 
 }
 
-typedef void (*rs_t)(const void *, void *, const void *, uint32_t, uint32_t, uint32_t, uint32_t);
-typedef void (*walk_loop_t)(const MTLaunchStruct*,
-                            RsExpandKernelDriverInfo,
-                            outer_foreach_t);
-
 static inline void FepPtrSetup(const MTLaunchStruct *mtls, RsExpandKernelDriverInfo *fep,
                                uint32_t x, uint32_t y,
                                uint32_t z = 0, uint32_t lod = 0,
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index 29423de2..fd40c21d 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -487,8 +487,6 @@ void RsdCpuScriptImpl::populateScript(Script *script) {
 }
 
 
-typedef void (*rs_t)(const void *, void *, const void *, uint32_t, uint32_t, uint32_t, uint32_t);
-
 bool RsdCpuScriptImpl::forEachMtlsSetup(const Allocation ** ains,
                                         uint32_t inLen,
                                         Allocation * aout,
diff --git a/driver/rsdCore.h b/driver/rsdCore.h
index d873e3e1..0e46fd24 100644
--- a/driver/rsdCore.h
+++ b/driver/rsdCore.h
@@ -28,11 +28,6 @@
 #include "rsdGL.h"
 #endif
 
-typedef void (* InvokeFunc_t)(void);
-typedef void (* ForEachFunc_t)(void);
-typedef int (* RootFunc_t)(void);
-typedef void (*WorkerCallback_t)(void *usr, uint32_t idx);
-
 typedef struct ScriptTLSStructRec {
     android::renderscript::Context * mContext;
     android::renderscript::Script * mScript;
@@ -51,9 +46,7 @@ typedef struct RsdHalRec {
 #endif
 } RsdHal;
 
-void rsdLaunchThreads(android::renderscript::Context *rsc, WorkerCallback_t cbk, void *data);
 void* rsdAllocRuntimeMem(size_t size, uint32_t flags);
 void rsdFreeRuntimeMem(void* ptr);
 
 #endif
-
diff --git a/driver/rsdGL.h b/driver/rsdGL.h
index 48c4c4ec..0e6ec66a 100644
--- a/driver/rsdGL.h
+++ b/driver/rsdGL.h
@@ -26,9 +26,6 @@ class RsdShaderCache;
 class RsdVertexArrayState;
 class RsdFrameBufferObj;
 
-typedef void (* InvokeFunc_t)(void);
-typedef void (*WorkerCallback_t)(void *usr, uint32_t idx);
-
 typedef struct RsdGLRec {
     struct {
         EGLint numConfigs;
@@ -96,4 +93,3 @@ void rsdGLDrawQuadTexCoords(const android::renderscript::Context *rsc,
                             float x4, float y4, float z4, float u4, float v4);
 
 #endif
-
diff --git a/rsScript.h b/rsScript.h
index 12de95c0..6ca4fc19 100644
--- a/rsScript.h
+++ b/rsScript.h
@@ -96,8 +96,6 @@ public:
     };
     Hal mHal;
 
-    typedef void (* InvokeFunc_t)(void);
-
     Script(Context *);
     virtual ~Script();