Move rs.h functions over to extern "C".
Change-Id: I0503a64d93dda558455dfebca90a0c820c80d7b1
diff --git a/rs.h b/rs.h
index 7f592f7..8a0761a 100644
--- a/rs.h
+++ b/rs.h
@@ -22,9 +22,8 @@
#include "rsDefines.h"
-//
-// A3D loading and object update code.
-// Should only be called at object creation, not thread safe
+// Legacy graphics functions
+// Not extern C because not used from C++ API
RsObjectBase rsaFileA3DGetEntryByIndex(RsContext, uint32_t idx, RsFile);
RsFile rsaFileA3DCreateFromMemory(RsContext, const void *data, uint32_t len);
RsFile rsaFileA3DCreateFromAsset(RsContext, void *asset);
@@ -32,30 +31,32 @@
void rsaFileA3DGetNumIndexEntries(RsContext, int32_t *numEntries, RsFile);
void rsaFileA3DGetIndexEntries(RsContext, RsFileIndexEntry *fileEntries,
uint32_t numEntries, RsFile);
-void rsaGetName(RsContext, void * obj, const char **name);
// Mesh update functions
void rsaMeshGetVertexBufferCount(RsContext, RsMesh, int32_t *vtxCount);
void rsaMeshGetIndexCount(RsContext, RsMesh, int32_t *idxCount);
void rsaMeshGetVertices(RsContext, RsMesh, RsAllocation *vtxData, uint32_t vtxDataCount);
void rsaMeshGetIndices(RsContext, RsMesh, RsAllocation *va,
uint32_t *primType, uint32_t idxDataCount);
-// Allocation update
-const void* rsaAllocationGetType(RsContext con, RsAllocation va);
-// Type update
-void rsaTypeGetNativeData(RsContext, RsType, uint32_t *typeData, uint32_t typeDataSize);
-// Element update
-void rsaElementGetNativeData(RsContext, RsElement, uint32_t *elemData, uint32_t elemDataSize);
-void rsaElementGetSubElements(RsContext, RsElement, uint32_t *ids, const char **names,
- uint32_t *arraySizes, uint32_t dataSize);
-
-RsDevice rsDeviceCreate();
-void rsDeviceDestroy(RsDevice dev);
-void rsDeviceSetConfig(RsDevice dev, RsDeviceParam p, int32_t value);
-RsContext rsContextCreate(RsDevice dev, uint32_t version, uint32_t sdkVersion,
- RsContextType ct, bool forceCpu, bool synchronous);
RsContext rsContextCreateGL(RsDevice dev, uint32_t version, uint32_t sdkVersion,
RsSurfaceConfig sc, uint32_t dpi);
+extern "C" {
+ void rsaGetName(RsContext, void * obj, const char **name);
+ // Allocation update
+ const void* rsaAllocationGetType(RsContext con, RsAllocation va);
+ // Type update
+ void rsaTypeGetNativeData(RsContext, RsType, uint32_t *typeData, uint32_t typeDataSize);
+ // Element update
+ void rsaElementGetNativeData(RsContext, RsElement, uint32_t *elemData, uint32_t elemDataSize);
+ void rsaElementGetSubElements(RsContext, RsElement, uint32_t *ids, const char **names,
+ uint32_t *arraySizes, uint32_t dataSize);
+
+ RsDevice rsDeviceCreate();
+ void rsDeviceDestroy(RsDevice dev);
+ void rsDeviceSetConfig(RsDevice dev, RsDeviceParam p, int32_t value);
+ RsContext rsContextCreate(RsDevice dev, uint32_t version, uint32_t sdkVersion,
+ RsContextType ct, bool forceCpu, bool synchronous);
+}
#include "rsgApiFuncDecl.h"
#endif // RENDER_SCRIPT_H
diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index 0c271c1..3a81e91 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -690,7 +690,7 @@
}
}
-const void * rsaAllocationGetType(RsContext con, RsAllocation va) {
+extern "C" const void * rsaAllocationGetType(RsContext con, RsAllocation va) {
Allocation *a = static_cast<Allocation *>(va);
a->getType()->incUserRef();
diff --git a/rsContext.cpp b/rsContext.cpp
index 4fb3728..44f2d74 100644
--- a/rsContext.cpp
+++ b/rsContext.cpp
@@ -897,8 +897,8 @@
}
}
-RsContext rsContextCreate(RsDevice vdev, uint32_t version, uint32_t sdkVersion,
- RsContextType ct, bool forceCpu, bool synchronous) {
+extern "C" RsContext rsContextCreate(RsDevice vdev, uint32_t version, uint32_t sdkVersion,
+ RsContextType ct, bool forceCpu, bool synchronous) {
//ALOGV("rsContextCreate dev=%p", vdev);
Device * dev = static_cast<Device *>(vdev);
Context *rsc = Context::createContext(dev, NULL, ct, forceCpu, synchronous);
diff --git a/rsDevice.cpp b/rsDevice.cpp
index d7d03f6..2688890 100644
--- a/rsDevice.cpp
+++ b/rsDevice.cpp
@@ -40,17 +40,17 @@
}
}
-RsDevice rsDeviceCreate() {
+extern "C" RsDevice rsDeviceCreate() {
Device * d = new Device();
return d;
}
-void rsDeviceDestroy(RsDevice dev) {
+extern "C" void rsDeviceDestroy(RsDevice dev) {
Device * d = static_cast<Device *>(dev);
delete d;
}
-void rsDeviceSetConfig(RsDevice dev, RsDeviceParam p, int32_t value) {
+extern "C" void rsDeviceSetConfig(RsDevice dev, RsDeviceParam p, int32_t value) {
Device * d = static_cast<Device *>(dev);
if (p == RS_DEVICE_PARAM_FORCE_SOFTWARE_GL) {
d->mForceSW = value != 0;
diff --git a/rsElement.cpp b/rsElement.cpp
index 559d567..793b968 100644
--- a/rsElement.cpp
+++ b/rsElement.cpp
@@ -402,7 +402,7 @@
}
}
-void rsaElementGetNativeData(RsContext con, RsElement elem,
+extern "C" void rsaElementGetNativeData(RsContext con, RsElement elem,
uint32_t *elemData, uint32_t elemDataSize) {
rsAssert(elemDataSize == 5);
// we will pack mType; mKind; mNormalized; mVectorSize; NumSubElements
@@ -415,7 +415,7 @@
(*elemData++) = e->getFieldCount();
}
-void rsaElementGetSubElements(RsContext con, RsElement elem, uintptr_t *ids,
+extern "C" void rsaElementGetSubElements(RsContext con, RsElement elem, uintptr_t *ids,
const char **names, size_t *arraySizes, uint32_t dataSize) {
Element *e = static_cast<Element *>(elem);
rsAssert(e->getFieldCount() == dataSize);
diff --git a/rsType.cpp b/rsType.cpp
index 9719a04..da55ad1 100644
--- a/rsType.cpp
+++ b/rsType.cpp
@@ -346,7 +346,7 @@
}
}
-void rsaTypeGetNativeData(RsContext con, RsType type, uintptr_t *typeData, uint32_t typeDataSize) {
+extern "C" void rsaTypeGetNativeData(RsContext con, RsType type, uintptr_t *typeData, uint32_t typeDataSize) {
rsAssert(typeDataSize == 6);
// Pack the data in the follofing way mHal.state.dimX; mHal.state.dimY; mHal.state.dimZ;
// mHal.state.lodCount; mHal.state.faces; mElement; into typeData