commit aa7d2884cb563f87294003981e03e37a1abeb961
author Alex Sakhartchouk <alexst@google.com> Fri May 21 12:53:13 2010 -0700
committer Alex Sakhartchouk <alexst@google.com> Fri May 21 14:00:10 2010 -0700
tree 85e27332bc586e3eae0ea334e624920de27687cd
parent dd56b39ec000b3ddd206d242b0fe24b4b955c8ee

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

libs/rs/rsAdapter.h

diff --git a/libs/rs/rsAdapter.h b/libs/rs/rsAdapter.h
index cb2872e..937ef50 100644
--- a/libs/rs/rsAdapter.h
+++ b/libs/rs/rsAdapter.h
@@ -49,6 +49,10 @@
 
     void subData(uint32_t xoff, uint32_t count, const void *data);
     void data(const void *data);
+    
+    virtual void serialize(OStream *stream) const;
+    virtual A3DClassID getClassId() const { return A3D_CLASS_ID_ADAPTER_1D; }
+    static Adapter1D *createFromStream(Context *rsc, IStream *stream);
 
 protected:
     ObjectBaseRef<Allocation> mAllocation;
@@ -81,6 +85,10 @@
 
     void data(const void *data);
     void subData(uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h, const void *data);
+    
+    virtual void serialize(OStream *stream) const;
+    virtual A3DClassID getClassId() const { return A3D_CLASS_ID_ADAPTER_2D; }
+    static Adapter2D *createFromStream(Context *rsc, IStream *stream);
 
 protected:
     ObjectBaseRef<Allocation> mAllocation;