Remove external matrix feature.
We haven't been testing this for nearly two years.
R=reed@google.com
Review URL: https://codereview.appspot.com/6640044
git-svn-id: http://skia.googlecode.com/svn/trunk@5857 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index e97bc8f..042e030 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -34,7 +34,7 @@
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 @@
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 @@
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