Switch SkBitmapProcState's SkFractionalInt to 32.32.
16 bits are not enough to hold the integral part of fx in
Clamp_S32_opaque_D32_nofilter_DX_shaderproc.
Weirdly, no GM diffs on my desktop.
BUG=skia:3096
Review URL: https://codereview.chromium.org/733163003
diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h
index 488836c..f332661 100644
--- a/include/core/SkFixed.h
+++ b/include/core/SkFixed.h
@@ -140,14 +140,14 @@
///////////////////////////////////////////////////////////////////////////////
-typedef int64_t SkFixed48;
+typedef int64_t SkFixed3232; // 32.32
-#define SkIntToFixed48(x) ((SkFixed48)(x) << 48)
-#define SkFixed48ToInt(x) ((int)((x) >> 48))
-#define SkFixedToFixed48(x) ((SkFixed48)(x) << 32)
-#define SkFixed48ToFixed(x) ((SkFixed)((x) >> 32))
-#define SkFloatToFixed48(x) ((SkFixed48)((x) * (65536.0f * 65536.0f * 65536.0f)))
+#define SkIntToFixed3232(x) ((SkFixed3232)(x) << 32)
+#define SkFixed3232ToInt(x) ((int)((x) >> 32))
+#define SkFixedToFixed3232(x) ((SkFixed3232)(x) << 16)
+#define SkFixed3232ToFixed(x) ((SkFixed)((x) >> 16))
+#define SkFloatToFixed3232(x) ((SkFixed3232)((x) * (65536.0f * 65536.0f)))
-#define SkScalarToFixed48(x) SkFloatToFixed48(x)
+#define SkScalarToFixed3232(x) SkFloatToFixed3232(x)
#endif
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index ac4f1a4..dd1f0bf 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -14,21 +14,11 @@
#include "SkMipMap.h"
#include "SkPaint.h"
-#define FractionalInt_IS_64BIT
-
-#ifdef FractionalInt_IS_64BIT
- typedef SkFixed48 SkFractionalInt;
- #define SkScalarToFractionalInt(x) SkScalarToFixed48(x)
- #define SkFractionalIntToFixed(x) SkFixed48ToFixed(x)
- #define SkFixedToFractionalInt(x) SkFixedToFixed48(x)
- #define SkFractionalIntToInt(x) SkFixed48ToInt(x)
-#else
- typedef SkFixed SkFractionalInt;
- #define SkScalarToFractionalInt(x) SkScalarToFixed(x)
- #define SkFractionalIntToFixed(x) (x)
- #define SkFixedToFractionalInt(x) (x)
- #define SkFractionalIntToInt(x) ((x) >> 16)
-#endif
+typedef SkFixed3232 SkFractionalInt;
+#define SkScalarToFractionalInt(x) SkScalarToFixed3232(x)
+#define SkFractionalIntToFixed(x) SkFixed3232ToFixed(x)
+#define SkFixedToFractionalInt(x) SkFixedToFixed3232(x)
+#define SkFractionalIntToInt(x) SkFixed3232ToInt(x)
class SkPaint;