commit f925ba4332db72db18ec2fc1b2fb9dd48949fe36
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 11 21:54:26 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 11 21:54:26 2012 +0000
tree 44e08336da68ad0c0818093f112efdcf86673a6c
parent 0032dad6163e570053f247c7404c1a360a87100e

Remove obsolete SK_USE_FLOAT_SQRT

http://codereview.appspot.com/5535053/



git-svn-id: http://skia.googlecode.com/svn/trunk@3023 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkGradientShader.cpp

diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp
index a907d04..bf7f4df 100644
--- a/src/effects/SkGradientShader.cpp
+++ b/src/effects/SkGradientShader.cpp
@@ -16,10 +16,6 @@
 #include "SkTemplates.h"
 #include "SkBitmapCache.h"
 
-#if defined(SK_SCALAR_IS_FLOAT) && !defined(SK_DONT_USE_FLOAT_SQRT)
-    #define SK_USE_FLOAT_SQRT
-#endif
-
 #ifndef SK_DISABLE_DITHER_32BIT_GRADIENT
     #define USE_DITHER_32BIT_GRADIENT
 #endif
@@ -1517,7 +1513,7 @@
 void shadeSpan_radial_mirror(SkFixed fx, SkFixed dx, SkFixed fy, SkFixed dy,
         SkPMColor* SK_RESTRICT dstC, const SkPMColor* SK_RESTRICT cache,
         int count, SkPoint& srcPt, float fdx, float fdy) {
-#ifdef SK_USE_FLOAT_SQRT
+#ifdef SK_SCALAR_IS_FLOAT
     float ffx = srcPt.fX;
     float ffy = srcPt.fY;
     do {
@@ -1584,7 +1580,7 @@
             (void)fDstToIndex.fixedStepInX(SkIntToScalar(y), &storage[0], &storage[1]);
             dx = storage[0];
             dy = storage[1];
-#ifdef SK_USE_FLOAT_SQRT
+#ifdef SK_SCALAR_IS_FLOAT
             fdx = SkFixedToFloat(storage[0]);
             fdy = SkFixedToFloat(storage[1]);
 #endif
@@ -1592,7 +1588,7 @@
             SkASSERT(fDstToIndexClass == kLinear_MatrixClass);
             dx = SkScalarToFixed(fDstToIndex.getScaleX());
             dy = SkScalarToFixed(fDstToIndex.getSkewY());
-#ifdef SK_USE_FLOAT_SQRT
+#ifdef SK_SCALAR_IS_FLOAT
             fdx = fDstToIndex.getScaleX();
             fdy = fDstToIndex.getSkewY();
 #endif