Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / render / renderers / render-sampler.h

diff --git a/dali/internal/render/renderers/render-sampler.h b/dali/internal/render/renderers/render-sampler.h
index 35557ca..c5040ae 100644 (file)
--- a/dali/internal/render/renderers/render-sampler.h
+++ b/dali/internal/render/renderers/render-sampler.h
@@ -50,21 +50,25 @@ struct Sampler
   ~Sampler()
   {}
 
-
-  union
+  bool operator==(const Sampler& rhs) const
   {
-    unsigned int mBitfield;
-
-    struct
-    {
-      FilterMode  mMinificationFilter   : 4;    ///< The minify filter
-      FilterMode  mMagnificationFilter  : 4;    ///< The magnify filter
-      WrapMode    mSWrapMode            : 4;    ///< The horizontal wrap mode
-      WrapMode    mTWrapMode            : 4;    ///< The vertical wrap mode
-      WrapMode    mRWrapMode            : 4;    ///< The vertical wrap mode
-    };
-
-  };
+    return ( ( mMinificationFilter == rhs.mMinificationFilter ) &&
+             ( mMagnificationFilter == rhs.mMagnificationFilter ) &&
+             ( mSWrapMode == rhs.mSWrapMode ) &&
+             ( mTWrapMode == rhs.mTWrapMode ) &&
+             ( mRWrapMode == rhs.mRWrapMode ) );
+  }
+
+  bool operator!=(const Sampler& rhs) const
+  {
+    return !(*this == rhs);
+  }
+
+  FilterMode  mMinificationFilter   : 4;    ///< The minify filter
+  FilterMode  mMagnificationFilter  : 4;    ///< The magnify filter
+  WrapMode    mSWrapMode            : 4;    ///< The horizontal wrap mode
+  WrapMode    mTWrapMode            : 4;    ///< The vertical wrap mode
+  WrapMode    mRWrapMode            : 4;    ///< The vertical wrap mode
 };
 
 } // namespace Render