Fix double to SkScalar issues in SkTwoPointConicalGradient_gpu.cpp
NOTREECHECKS=True
NOTRY=True
TBR=bsalomon@google.com
BUG=skia:
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/247833003
git-svn-id: http://skia.googlecode.com/svn/trunk@14318 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp
index 969d290..e697606 100644
--- a/gm/gradients_2pt_conical.cpp
+++ b/gm/gradients_2pt_conical.cpp
@@ -110,7 +110,7 @@
center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
return SkGradientShader::CreateTwoPointConical(
- center1, 0.0,
+ center1, 0.f,
center0, (pts[1].fX - pts[0].fX) / 2,
data.fColors, data.fPos, data.fCount, tm, mapper);
}
@@ -124,7 +124,7 @@
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
return SkGradientShader::CreateTwoPointConical(
center1, (pts[1].fX - pts[0].fX) / 2,
- center0, 0.0,
+ center0, 0.f,
data.fColors, data.fPos, data.fCount, tm, mapper);
}
@@ -136,7 +136,7 @@
center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
return SkGradientShader::CreateTwoPointConical(
- center0, 0.0,
+ center0, 0.f,
center0, (pts[1].fX - pts[0].fX) / 2,
data.fColors, data.fPos, data.fCount, tm, mapper);
}
@@ -144,7 +144,7 @@
static SkShader* Make2ConicalZeroRadOutside(const SkPoint pts[2], const GradData& data,
SkShader::TileMode tm, SkUnitMapper* mapper) {
SkPoint center0, center1;
- SkScalar radius0 = 0.0;
+ SkScalar radius0 = 0.f;
SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3);
center0.set(pts[0].fX + radius0, pts[0].fY + radius0);
center1.set(pts[1].fX - radius1, pts[1].fY - radius1);
@@ -157,7 +157,7 @@
static SkShader* Make2ConicalZeroRadFlipOutside(const SkPoint pts[2], const GradData& data,
SkShader::TileMode tm, SkUnitMapper* mapper) {
SkPoint center0, center1;
- SkScalar radius0 = 0.0;
+ SkScalar radius0 = 0.f;
SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3);
center0.set(pts[0].fX + radius0, pts[0].fY + radius0);
center1.set(pts[1].fX - radius1, pts[1].fY - radius1);
@@ -197,7 +197,7 @@
static SkShader* Make2ConicalZeroRadEdgeX(const SkPoint pts[2], const GradData& data,
SkShader::TileMode tm, SkUnitMapper* mapper) {
SkPoint center0, center1;
- SkScalar radius0 = 0.0;
+ SkScalar radius0 = 0.f;
SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3);
center1.set(SkScalarAve(pts[0].fX, pts[1].fX),
SkScalarAve(pts[0].fY, pts[1].fY));
@@ -211,7 +211,7 @@
static SkShader* Make2ConicalZeroRadEdgeY(const SkPoint pts[2], const GradData& data,
SkShader::TileMode tm, SkUnitMapper* mapper) {
SkPoint center0, center1;
- SkScalar radius0 = 0.0;
+ SkScalar radius0 = 0.f;
SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3);
center1.set(SkScalarAve(pts[0].fX, pts[1].fX),
SkScalarAve(pts[0].fY, pts[1].fY));
@@ -258,7 +258,7 @@
center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
return SkGradientShader::CreateTwoPointConical(
- center0, 0.0000000000000000001,
+ center0, 0.0000000000000000001f,
center0, (pts[1].fX - pts[0].fX) / 2,
data.fColors, data.fPos, data.fCount, tm, mapper);
}
diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
index f7b2059..613e5a3 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
@@ -15,7 +15,7 @@
// For brevity
typedef GrGLUniformManager::UniformHandle UniformHandle;
-static const SkScalar kErrorTol = 0.00001;
+static const SkScalar kErrorTol = 0.00001f;
/**
* We have three general cases for 2pt conical gradients. First we always assume that
@@ -305,7 +305,7 @@
const SkPoint& focal = shader.getStartCenter();
const SkPoint& centerEnd = shader.getEndCenter();
SkScalar radius = shader.getEndRadius();
- SkScalar invRadius = 1.0 / radius;
+ SkScalar invRadius = 1.f / radius;
SkMatrix matrix;
@@ -316,7 +316,7 @@
matrix.mapPoints(&focalTrans, &focal, 1);
*focalX = focalTrans.length();
- if (0.0 != *focalX) {
+ if (0.f != *focalX) {
SkScalar invFocalX = SkScalarInvert(*focalX);
SkMatrix rot;
rot.setSinCos(-SkScalarMul(invFocalX, focalTrans.fY),
@@ -324,22 +324,22 @@
matrix.postConcat(rot);
}
- matrix.postTranslate(-(*focalX), 0.0);
+ matrix.postTranslate(-(*focalX), 0.f);
// If the focal point is touching the edge of the circle it will
// cause a degenerate case that must be handled separately
// 5 * kErrorTol was picked after manual testing the stability trade off
// versus the linear approx used in the Edge Shader
- if (SkScalarAbs(1.0 - (*focalX)) < 5 * kErrorTol) {
+ if (SkScalarAbs(1.f - (*focalX)) < 5 * kErrorTol) {
return kEdge_ConicalType;
}
// Scale factor 1 / (1 - focalX * focalX)
- SkScalar oneMinusF2 = 1.0 - SkScalarMul(*focalX, *focalX);
- SkScalar s = SkScalarDiv(1.0, oneMinusF2);
+ SkScalar oneMinusF2 = 1.f - SkScalarMul(*focalX, *focalX);
+ SkScalar s = SkScalarDiv(1.f, oneMinusF2);
- if (s >= 0.0) {
+ if (s >= 0.f) {
conicalType = kInside_ConicalType;
matrix.postScale(s, s * SkScalarSqrt(oneMinusF2));
} else {
@@ -448,7 +448,7 @@
const GrDrawTargetCaps&,
GrTexture**) {
SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
- SkScalar radius1 = 0.0;
+ SkScalar radius1 = 0.f;
SkPoint center2;
SkScalar radius2;
do {
@@ -458,7 +458,7 @@
SkPoint diff = center2 - center1;
SkScalar diffLen = diff.length();
// Below makes sure that the focal point is not contained within circle two
- radius2 = random->nextRangeF(0.0, diffLen);
+ radius2 = random->nextRangeF(0.f, diffLen);
SkColor colors[kMaxRandomGradientColors];
SkScalar stopsArray[kMaxRandomGradientColors];
@@ -538,7 +538,7 @@
SkScalar focal = data.focal();
if (fCachedFocal != focal) {
- SkScalar oneMinus2F = 1.0 - SkScalarMul(focal, focal);
+ SkScalar oneMinus2F = 1.f - SkScalarMul(focal, focal);
float values[2] = {
SkScalarToFloat(focal),
@@ -655,7 +655,7 @@
const GrDrawTargetCaps&,
GrTexture**) {
SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
- SkScalar radius1 = 0.0;
+ SkScalar radius1 = 0.f;
SkPoint center2;
SkScalar radius2;
do {
@@ -758,7 +758,7 @@
matrix.setTranslate(-centerStart.fX, -centerStart.fY);
- SkScalar invStartRad = 1.0 / radiusStart;
+ SkScalar invStartRad = 1.f / radiusStart;
matrix.postScale(invStartRad, invStartRad);
radiusEnd /= radiusStart;
@@ -777,8 +777,8 @@
return kEdge_ConicalType;
}
- SkScalar C = 1.0 / A;
- SkScalar B = (radiusEnd - 1.0) * C;
+ SkScalar C = 1.f / A;
+ SkScalar B = (radiusEnd - 1.f) * C;
matrix.postScale(C, C);
@@ -790,7 +790,7 @@
info->fC = C;
// if A ends up being negative, the start circle is contained completely inside the end cirlce
- if (A < 0.0) {
+ if (A < 0.f) {
return kInside_ConicalType;
}
return kOutside_ConicalType;
@@ -897,7 +897,7 @@
const GrDrawTargetCaps&,
GrTexture**) {
SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
- SkScalar radius1 = random->nextUScalar1() + 0.0001; // make sure radius1 != 0
+ SkScalar radius1 = random->nextUScalar1() + 0.0001f; // make sure radius1 != 0
SkPoint center2;
SkScalar radius2;
do {
@@ -1124,7 +1124,7 @@
const GrDrawTargetCaps&,
GrTexture**) {
SkPoint center1 = {random->nextUScalar1(), random->nextUScalar1()};
- SkScalar radius1 = random->nextUScalar1() + 0.0001; // make sure radius1 != 0
+ SkScalar radius1 = random->nextUScalar1() + 0.0001f; // make sure radius1 != 0
SkPoint center2;
SkScalar radius2;
SkScalar diffLen;
@@ -1136,7 +1136,7 @@
diffLen = diff.length();
// Below makes sure that circle one is not contained within circle two
// and have radius2 >= radius to match sorting on cpu side
- radius2 = radius1 + random->nextRangeF(0.0, diffLen);
+ radius2 = radius1 + random->nextRangeF(0.f, diffLen);
SkColor colors[kMaxRandomGradientColors];
SkScalar stopsArray[kMaxRandomGradientColors];