diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 17:55:26 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 17:55:26 +0000 |
| commit | b9119a6b563bf737e34d22f8bb96fc09a606c76f (patch) | |
| tree | ee5f3c5a9853ae80a7ebb7b70bbb6b39e710dee8 | |
| parent | dbbc4e2da93cef5c0cfb0b3c92ff6c2c80f6e67a (diff) | |
Fix static assert on non-windows compilers(?)
git-svn-id: http://skia.googlecode.com/svn/trunk@4759 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | src/effects/SkLightingImageFilter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index 21a553dd71..a46cedd4f2 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -30,8 +30,7 @@ const SkScalar gOneHalf = SkFloatToScalar(0.5f); const SkScalar gOneQuarter = SkFloatToScalar(0.25f); void setUniformPoint3(const GrGLUniformManager& uman, UniformHandle uni, const SkPoint3& point) { - GR_STATIC_ASSERT(offsetof(SkPoint3, fX) + sizeof(float) == offsetof(SkPoint3, fY)); - GR_STATIC_ASSERT(offsetof(SkPoint3, fY) + sizeof(float) == offsetof(SkPoint3, fZ)); + GR_STATIC_ASSERT(sizeof(SkPoint3) == 3 * sizeof(GrGLfloat)); uman.set3fv(uni, 0, 1, &point.fX); } |