Fixed point no longer crashes when GL enabled in gm tests.
http://codereview.appspot.com/4532073/
git-svn-id: http://skia.googlecode.com/svn/trunk@1394 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrScalar.h b/gpu/include/GrScalar.h
index a26b67c..35cd61a 100644
--- a/gpu/include/GrScalar.h
+++ b/gpu/include/GrScalar.h
@@ -40,6 +40,7 @@
#define GrScalarHalf(a) SkScalarHalf(a)
#define GrScalarAve(a,b) SkScalarAve(a,b)
#define GrMul(a,b) SkScalarMul(a,b)
+#define GrScalarDiv(a,b) SkScalarDiv(a, b)
#define GrScalarToFloat(a) SkScalarToFloat(a)
#define GrFloatToScalar(a) SkScalarToFloat(a)
#define GrIntToScalar(a) SkIntToScalar(a)
diff --git a/gpu/src/GrPathRenderer.cpp b/gpu/src/GrPathRenderer.cpp
index 5bea5e6..58bb12e 100644
--- a/gpu/src/GrPathRenderer.cpp
+++ b/gpu/src/GrPathRenderer.cpp
@@ -203,8 +203,7 @@
// TODO: deal with perspective in some better way.
tol /= 10;
} else {
- GrScalar sinv = GR_Scalar1 / stretch;
- tol = GrMul(tol, sinv);
+ tol = GrScalarDiv(tol, stretch);
}
GrScalar tolSqd = GrMul(tol, tol);
diff --git a/gpu/src/GrTesselatedPathRenderer.cpp b/gpu/src/GrTesselatedPathRenderer.cpp
index 51d6db8..ff73a41 100644
--- a/gpu/src/GrTesselatedPathRenderer.cpp
+++ b/gpu/src/GrTesselatedPathRenderer.cpp
@@ -145,8 +145,7 @@
// TODO: deal with perspective in some better way.
tol /= 10;
} else {
- GrScalar sinv = GR_Scalar1 / stretch;
- tol = GrMul(tol, sinv);
+ tol = GrScalarDiv(tol, stretch);
}
GrScalar tolSqd = GrMul(tol, tol);