Removed unnecessary change based on comments.
Now using android utils lib.
collada_to_a3d seems to work with android util libs.
Integrating old changelist
Changing assert to rsAssrt in VertexArray
making context compile.
Change-Id: I33890defa777f09253bfab630d97782359ec49d7
Added serialization code to rsLib
Integrated old changelist
Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311
Added serialization code to rsLib
Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311
diff --git a/rsScriptC.h b/rsScriptC.h
index 1ee13e1..216c6f2 100644
--- a/rsScriptC.h
+++ b/rsScriptC.h
@@ -21,8 +21,6 @@
#include "RenderScriptEnv.h"
-#include <utils/KeyedVector.h>
-
struct BCCscript;
// ---------------------------------------------------------------------------
@@ -61,6 +59,10 @@
virtual void setupScript();
virtual uint32_t run(Context *, uint32_t launchID);
+
+ virtual void serialize(OStream *stream) const { }
+ virtual A3DClassID getClassId() const { return A3D_CLASS_ID_SCRIPT_C; }
+ static Type *createFromStream(Context *rsc, IStream *stream) { return NULL; }
};
class ScriptCState