diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-20 19:11:50 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-05-20 19:11:50 +0000 |
| commit | 8c5753ea2e74ac46224f4b38f3bdec3e1bba64c6 (patch) | |
| tree | b9b12d830e233e40a0bbfd435644b9f996105784 /gpu | |
| parent | e4c98ff48da46c61b73b72301a1811ad1c45a617 (diff) | |
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
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/include/GrScalar.h | 1 | ||||
| -rw-r--r-- | gpu/src/GrPathRenderer.cpp | 3 | ||||
| -rw-r--r-- | gpu/src/GrTesselatedPathRenderer.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gpu/include/GrScalar.h b/gpu/include/GrScalar.h index a26b67c3bc..35cd61a22c 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 5bea5e6b98..58bb12e01d 100644 --- a/gpu/src/GrPathRenderer.cpp +++ b/gpu/src/GrPathRenderer.cpp @@ -203,8 +203,7 @@ void GrDefaultPathRenderer::onDrawPath(GrDrawTarget* target, // 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 51d6db8e10..ff73a4143b 100644 --- a/gpu/src/GrTesselatedPathRenderer.cpp +++ b/gpu/src/GrTesselatedPathRenderer.cpp @@ -145,8 +145,7 @@ void GrTesselatedPathRenderer::drawPath(GrDrawTarget* target, // 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); |