commit a6dd823b9dcbd7ce7dfc34eda52a1e4104771f79
author Jason Sams <jsams@google.com> Wed Jul 25 19:33:43 2012 -0700
committer Jason Sams <jsams@google.com> Wed Jul 25 19:33:43 2012 -0700
tree 324d0c1e625f5ae39b6e783df8c08f75cd5d0350
parent 807fdc4b6f3fb893015ee136565d6151bb2332d3

Cleanup pointer access in adapter and font.

Change-Id: Ie500574adebb9bdb38c138f78582af2cd7610f76

rsAdapter.h

diff --git a/rsAdapter.h b/rsAdapter.h
index 4134a98..7b189cf 100644
--- a/rsAdapter.h
+++ b/rsAdapter.h
@@ -32,7 +32,6 @@
     Adapter1D(Context *);
     Adapter1D(Context *, Allocation *);
     void reset();
-    void * getElement(uint32_t x);
 
     void setAllocation(Allocation *a) {mAllocation.set(a);}
 
@@ -43,11 +42,9 @@
     inline void setY(uint32_t y) {mY = y;}
     inline void setZ(uint32_t z) {mZ = z;}
     inline void setLOD(uint32_t lod) {mLOD = lod;}
-    inline void setFace(uint32_t face) {mFace = face;}
-    //void setArray(uint32_t num, uint32_t value);
+    inline void setFace(RsAllocationCubemapFace face) {mFace = face;}
 
-    void subData(uint32_t xoff, uint32_t count, const void *data);
-    void data(const void *data);
+    void data(Context *rsc, uint32_t xoff, uint32_t count, const void *data, size_t sizeBytes);
 
     virtual void serialize(Context *rsc, OStream *stream) const;
     virtual RsA3DClassID getClassId() const { return RS_A3D_CLASS_ID_ADAPTER_1D; }
@@ -58,7 +55,7 @@
     uint32_t mY;
     uint32_t mZ;
     uint32_t mLOD;
-    uint32_t mFace;
+    RsAllocationCubemapFace mFace;
 };
 
 class Adapter2D : public ObjectBase {
@@ -69,7 +66,6 @@
     Adapter2D(Context *);
     Adapter2D(Context *, Allocation *);
     void reset();
-    void * getElement(uint32_t x, uint32_t y) const;
 
     uint32_t getDimX() const {return mAllocation->getType()->getLODDimX(mLOD);}
     uint32_t getDimY() const {return mAllocation->getType()->getLODDimY(mLOD);}
@@ -78,11 +74,10 @@
     void setAllocation(Allocation *a) {mAllocation.set(a);}
     inline void setZ(uint32_t z) {mZ = z;}
     inline void setLOD(uint32_t lod) {mLOD = lod;}
-    inline void setFace(uint32_t face) {mFace = face;}
-    //void setArray(uint32_t num, uint32_t value);
+    inline void setFace(RsAllocationCubemapFace face) {mFace = face;}
 
-    void data(const void *data);
-    void subData(uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h, const void *data);
+    void data(Context *rsc, uint32_t xoff, uint32_t yoff, uint32_t w, uint32_t h,
+              const void *data, size_t sizeBytes);
 
     virtual void serialize(Context *rsc, OStream *stream) const;
     virtual RsA3DClassID getClassId() const { return RS_A3D_CLASS_ID_ADAPTER_2D; }
@@ -92,7 +87,7 @@
     ObjectBaseRef<Allocation> mAllocation;
     uint32_t mZ;
     uint32_t mLOD;
-    uint32_t mFace;
+    RsAllocationCubemapFace mFace;
 };
 
 }