improve precision of gradients

src/effects/gradients/SkClampRange.h

-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
 #ifndef SkClampRange_DEFINED
 #define SkClampRange_DEFINED
 
 #include "SkFixed.h"
+#include "SkScalar.h"
+
+#define SK_SUPPORT_LEGACY_GRADIENT_PRECISION
+
+typedef int64_t SkF32Dot32;

[caryclark, 2014/12/18 19:40:56]

is this different from SkFixed3232 ?

[reed1, 2014/12/18 20:17:49]

Done.

+
+static inline SkF32Dot32 SkFixedToF32Dot32(SkFixed value) {

[caryclark, 2014/12/18 19:40:56]

looks like SkFixedToFixed3232 ?

[reed1, 2014/12/18 20:17:49]

Done.

+    SkF32Dot32 value32 = value;
+    return value32 << 16;
+}
+
+static inline SkF32Dot32 SkScalarToF32Dot32(SkScalar x) {

[caryclark, 2014/12/18 19:40:56]

looks like SkFloatToFixed3232 ?

[reed1, 2014/12/18 20:17:49]

Done.

+    return (SkF32Dot32)(x * (1LL << 32));
+}
+
+#ifdef SK_SUPPORT_LEGACY_GRADIENT_PRECISION
+    #define SkGradFixed             SkFixed
+    #define SkScalarToGradFixed     SkScalarToFixed
+    #define SkFixedToGradFixed(x)   (x)
+    #define SkGradFixedToFixed(x)   (x)
+    #define kFracMax_SkGradFixed    0xFFFF
+#else
+    #define SkGradFixed             SkF32Dot32
+    #define SkScalarToGradFixed     SkScalarToF32Dot32
+    #define SkFixedToGradFixed      SkFixedToF32Dot32
+    #define SkGradFixedToFixed(x)   (SkFixed)((x) >> 16)
+    #define kFracMax_SkGradFixed    0xFFFFFFFFLL
+#endif
 
 /**
- *  Iteration fixed fx by dx, clamping as you go to [0..0xFFFF], this class
+ *  Iteration fixed fx by dx, clamping as you go to [0..kFracMax_SkGradFixed], this class
  *  computes the (up to) 3 spans there are:
  *
  *  range0: use constant value V0
  *  range1: iterate as usual fx += dx
  *  range2: use constant value V1
  */
 struct SkClampRange {
     int fCount0;    // count for fV0
     int fCount1;    // count for interpolating (fV0...fV1)
     int fCount2;    // count for fV1
-    SkFixed fFx1;   // initial fx value for the fCount1 range.
+    SkGradFixed fFx1;   // initial fx value for the fCount1 range.
                     // only valid if fCount1 > 0
     int fV0, fV1;
 
-    void init(SkFixed fx, SkFixed dx, int count, int v0, int v1);
+    void init(SkGradFixed fx, SkGradFixed dx, int count, int v0, int v1);
 
 private:
-    void initFor1(SkFixed fx);
+    void initFor1(SkGradFixed fx);
 };
 
 #endif