commit c2c02a88641620f50a69cc174077ac8bbef40478
author Alex Sakhartchouk <alexst@google.com> Wed May 04 17:45:36 2011 -0700
committer Alex Sakhartchouk <alexst@google.com> Wed May 04 17:45:36 2011 -0700
tree 9f2768b54bdc59ce3dec6415c0b18e5821e3da97
parent d3e7107c60ce06d637d83fa0db783ecdd0ad534c

Code Cleanup and better Sampler creation method

Change-Id: I9e35081ee6034cb619f43a47f8f22f38977f5d12

rsSampler.h

diff --git a/rsSampler.h b/rsSampler.h
index 737bb8b..192ee07 100644
--- a/rsSampler.h
+++ b/rsSampler.h
@@ -50,14 +50,22 @@
     virtual RsA3DClassID getClassId() const { return RS_A3D_CLASS_ID_SAMPLER; }
     static Sampler *createFromStream(Context *rsc, IStream *stream);
 
-protected:
-    RsSamplerValue mMagFilter;
-    RsSamplerValue mMinFilter;
-    RsSamplerValue mWrapS;
-    RsSamplerValue mWrapT;
-    RsSamplerValue mWrapR;
-    float mAniso;
+    struct Hal {
+        mutable void *drv;
 
+        struct State {
+            RsSamplerValue magFilter;
+            RsSamplerValue minFilter;
+            RsSamplerValue wrapS;
+            RsSamplerValue wrapT;
+            RsSamplerValue wrapR;
+            float aniso;
+        };
+        State state;
+    };
+    Hal mHal;
+
+protected:
     int32_t mBoundSlot;
 
 private:
@@ -67,13 +75,6 @@
 
 class SamplerState {
 public:
-    RsSamplerValue mMagFilter;
-    RsSamplerValue mMinFilter;
-    RsSamplerValue mWrapS;
-    RsSamplerValue mWrapT;
-    RsSamplerValue mWrapR;
-    float mAniso;
-
     ObjectBaseRef<Sampler> mSamplers[RS_MAX_SAMPLER_SLOT];
 };