commit a423096c0d49e5cfe13a400b4323a76f89c6885c
author Tim Murray <timmurray@google.com> Wed Jul 17 16:50:10 2013 -0700
committer Tim Murray <timmurray@google.com> Tue Jul 23 16:48:41 2013 -0700
tree 287bb1663043311f450980c7f741cc7ae3fc757a
parent f51f8c741dda633f525a3eeb7552bff5819a75f0

Move C++ API over to function tables rather than linking libRS directly.

Change-Id: I7841df768d5bd10fa941b3655673fd73496a8137

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index be011aa..fcc5fc5 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -24,6 +24,8 @@
 #include "RefBase.h"
 #endif
 
+#include "rsDispatch.h"
+
 // Every row in an RS allocation is guaranteed to be aligned by this amount
 // Every row in a user-backed allocation must be aligned by this amount
 #define RS_CPU_ALLOCATION_ALIGNMENT 16
@@ -62,7 +64,13 @@
 
     void finish();
 
+    static dispatchTable* dispatch;
+
  private:
+    static void* librs;
+
+    static bool initDispatch(int targetApi);
+
     bool init(int targetApi, bool forceCpu, bool synchronous);
     static void * threadProc(void *);
 
@@ -78,6 +86,7 @@
 
     ErrorHandlerFunc_t mErrorFunc;
     MessageHandlerFunc_t mMessageFunc;
+    bool mInit;
 
     struct {
         Element *U8;