diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 13:29:35 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 13:29:35 +0000 |
| commit | 7cfb9c7b6186bf1e42b7d13466eab94470587e7e (patch) | |
| tree | 3a5d00f33b9330a1bf4092364d11b7073f549097 /include/utils/SkMatrix44.h | |
| parent | 388974f1dd4d7f1a202aac8a007dc2a4eaf051cb (diff) | |
Revert r7241, which broke tests on most platforms.
git-svn-id: http://skia.googlecode.com/svn/trunk@7245 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils/SkMatrix44.h')
| -rw-r--r-- | include/utils/SkMatrix44.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/include/utils/SkMatrix44.h b/include/utils/SkMatrix44.h index 83fb7c9946..41f1a30209 100644 --- a/include/utils/SkMatrix44.h +++ b/include/utils/SkMatrix44.h @@ -51,11 +51,6 @@ static const SkMScalar SK_MScalarPI = 3.14159265f; #endif -#if (defined(__x86_64__) || defined(_M_X64) || defined(__SSE2__)) && \ -defined(SK_MSCALAR_IS_DOUBLE) -#define SK_MATRIX44_USE_SSE2 -#endif - #define SkMScalarToScalar SkMScalarToFloat #define SkScalarToMScalar SkFloatToMScalar @@ -104,11 +99,7 @@ struct SkVector4 { } }; -class -#if defined(SK_MATRIX44_USE_SSE2) && defined(_MSC_VER) -__declspec(align(16)) -#endif -SK_API SkMatrix44 { +class SK_API SkMatrix44 { public: enum Uninitialized_Constructor { @@ -407,10 +398,6 @@ private: inline bool isTriviallyIdentity() const { return 0 == fTypeMask; } -} -#if defined(SK_MATRIX44_USE_SSE2) && !defined(_MSC_VER) -__attribute__ ((aligned (16))) -#endif -; +}; #endif |