aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrTextContext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu/GrTextContext.cpp')
-rw-r--r--src/gpu/GrTextContext.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index e97bc8f3a2..042e0307d9 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -34,7 +34,7 @@ void GrTextContext::flushGlyphs() {
GrAssert(GrIsALIGN4(fCurrVertex));
GrAssert(fCurrTexture);
- GrTextureParams params(SkShader::kRepeat_TileMode, !fExtMatrix.isIdentity());
+ GrTextureParams params(SkShader::kRepeat_TileMode, false);
drawState->createTextureEffect(kGlyphMaskStage, fCurrTexture, params);
if (!GrPixelConfigIsAlphaOnly(fCurrTexture->config())) {
@@ -70,21 +70,13 @@ void GrTextContext::flushGlyphs() {
fDrawTarget = NULL;
}
-GrTextContext::GrTextContext(GrContext* context,
- const GrPaint& paint,
- const GrMatrix* extMatrix) : fPaint(paint) {
+GrTextContext::GrTextContext(GrContext* context, const GrPaint& paint) : fPaint(paint) {
fContext = context;
fStrike = NULL;
fCurrTexture = NULL;
fCurrVertex = 0;
- if (NULL != extMatrix) {
- fExtMatrix = *extMatrix;
- } else {
- fExtMatrix.reset();
- }
-
const GrClipData* clipData = context->getClip();
GrRect devConservativeBound;
@@ -95,19 +87,12 @@ GrTextContext::GrTextContext(GrContext* context,
context->getRenderTarget()->height(),
&devConservativeBound);
- if (!fExtMatrix.isIdentity()) {
- GrMatrix inverse;
- if (fExtMatrix.invert(&inverse)) {
- inverse.mapRect(&devConservativeBound);
- }
- }
-
devConservativeBound.roundOut(&fClipRect);
// save the context's original matrix off and restore in destructor
// this must be done before getTextTarget.
fOrigViewMatrix = fContext->getMatrix();
- fContext->setMatrix(fExtMatrix);
+ fContext->setIdentityMatrix();
/*
We need to call preConcatMatrix with our viewmatrix's inverse, for each