diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-22 20:34:01 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-22 20:34:01 +0000 |
commit | ffca400ef6f96a280c3e2c09210f950af64a1f24 (patch) | |
tree | 2292badadfe451a456616652c8df3291d8a80158 /gpu/src/GrTextContext.cpp | |
parent | bdee9fc778d4387d805d717f2cd7fc7074991fdb (diff) |
Make a separate path renderer object. Move enum types to GrTypes.h
Review URL http://codereview.appspot.com/4167067/
git-svn-id: http://skia.googlecode.com/svn/trunk@829 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrTextContext.cpp')
-rw-r--r-- | gpu/src/GrTextContext.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gpu/src/GrTextContext.cpp b/gpu/src/GrTextContext.cpp index 0f244a2e81..8ce45e40eb 100644 --- a/gpu/src/GrTextContext.cpp +++ b/gpu/src/GrTextContext.cpp @@ -23,6 +23,7 @@ #include "GrFontScaler.h" #include "GrIndexBuffer.h" #include "GrGpuVertex.h" +#include "GrDrawTarget.h" static const int TEXT_STAGE = 1; @@ -47,7 +48,7 @@ void GrTextContext::flushGlyphs() { fDrawTarget->setTexture(TEXT_STAGE, fCurrTexture); fDrawTarget->setIndexSourceToBuffer(fContext->getQuadIndexBuffer()); - fDrawTarget->drawIndexed(GrDrawTarget::kTriangles_PrimitiveType, + fDrawTarget->drawIndexed(kTriangles_PrimitiveType, 0, 0, fCurrVertex, nIndices); fDrawTarget->releaseReservedGeometry(); fVertices = NULL; @@ -178,7 +179,7 @@ void GrTextContext::drawPackedGlyph(GrGlyph::PackedID packed, GrPoint translate; translate.set(GrFixedToScalar(vx - GrIntToFixed(glyph->fBounds.fLeft)), GrFixedToScalar(vy - GrIntToFixed(glyph->fBounds.fTop))); - fContext->drawPath(fPaint, &iter, GrContext::kWinding_PathFill, + fContext->drawPath(fPaint, &iter, kWinding_PathFill, &translate); return; } |