diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
| commit | 972f9cd7a063d0544f8c919fd12b9a3adbd12b24 (patch) | |
| tree | f72b7df8838068916ec1c61ed02db69342d9a21b /src/gpu/GrDistanceFieldTextContext.cpp | |
| parent | 0e9e6a331394721bdc47607733880d4c67b595dd (diff) | |
SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h
BUG=skia:
R=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/216503004
git-svn-id: http://skia.googlecode.com/svn/trunk@13982 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrDistanceFieldTextContext.cpp')
| -rwxr-xr-x | src/gpu/GrDistanceFieldTextContext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index 4ce336beb0..638ec59707 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -76,7 +76,7 @@ void GrDistanceFieldTextContext::flushGlyphs() { if (fCurrVertex > 0) { // setup our sampler state for our text texture/atlas - SkASSERT(GrIsALIGN4(fCurrVertex)); + SkASSERT(SkIsAlign4(fCurrVertex)); SkASSERT(fCurrTexture); GrTextureParams params(SkShader::kRepeat_TileMode, GrTextureParams::kBilerp_FilterMode); @@ -126,13 +126,13 @@ namespace { // position + texture coord extern const GrVertexAttrib gTextVertexAttribs[] = { {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding}, - {kVec2f_GrVertexAttribType, sizeof(GrPoint), kEffect_GrVertexAttribBinding} + {kVec2f_GrVertexAttribType, sizeof(SkPoint), kEffect_GrVertexAttribBinding} }; }; void GrDistanceFieldTextContext::drawPackedGlyph(GrGlyph::PackedID packed, - GrFixed vx, GrFixed vy, + SkFixed vx, SkFixed vy, GrFontScaler* scaler) { if (NULL == fDrawTarget) { return; @@ -257,7 +257,7 @@ HAS_ATLAS: GrTCast<void**>(&fVertices), NULL); GrAlwaysAssert(success); - SkASSERT(2*sizeof(GrPoint) == fDrawTarget->getDrawState().getVertexSize()); + SkASSERT(2*sizeof(SkPoint) == fDrawTarget->getDrawState().getVertexSize()); } SkScalar dx = SkIntToScalar(glyph->fBounds.fLeft); @@ -273,10 +273,10 @@ HAS_ATLAS: width *= scale; height *= scale; - GrFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX); - GrFixed ty = SkIntToFixed(glyph->fAtlasLocation.fY); - GrFixed tw = SkIntToFixed(glyph->fBounds.width()); - GrFixed th = SkIntToFixed(glyph->fBounds.height()); + SkFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX); + SkFixed ty = SkIntToFixed(glyph->fAtlasLocation.fY); + SkFixed tw = SkIntToFixed(glyph->fBounds.width()); + SkFixed th = SkIntToFixed(glyph->fBounds.height()); static const size_t kVertexSize = 2 * sizeof(SkPoint); fVertices[2*fCurrVertex].setRectFan(sx, |