Rename viewMatrix to drawMatrix, initialMatrix, or currentMatrix
The viewMatrix has three different uses.
* drawMatrix is the matrix passed in by the drawTextBlob.
* initialMatrix is drawMatrix this a blob was created with.
* currentMatrix describes what stored in the SubRun.
Change-Id: Idd547f079950385485a279d22728f03145d5a77f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/259834
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp
index 6d0f242..f7290d7 100644
--- a/src/atlastext/SkAtlasTextTarget.cpp
+++ b/src/atlastext/SkAtlasTextTarget.cpp
@@ -241,7 +241,7 @@
// TODO4F: Preserve float colors
GrTextBlob::VertexRegenerator regenerator(
resourceProvider, fGeoData[i].fSubRunPtr,
- fGeoData[i].fViewMatrix, fGeoData[i].fX, fGeoData[i].fY,
+ fGeoData[i].fDrawMatrix, fGeoData[i].fX, fGeoData[i].fY,
fGeoData[i].fColor.toBytes_RGBA(), &context, glyphCache, atlasManager);
bool done = false;
while (!done) {
@@ -252,7 +252,7 @@
done = result.fFinished;
context.recordDraw(result.fFirstVertex, result.fGlyphsRegenerated,
- fGeoData[i].fViewMatrix, target->handle());
+ fGeoData[i].fDrawMatrix, target->handle());
if (!result.fFinished) {
// Make space in the atlas so we can continue generating vertices.
context.flush();
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 7ee8195..fe734c6 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -87,11 +87,11 @@
if (this->usesDistanceFields()) {
bool isLCD = this->isLCD();
- const SkMatrix& viewMatrix = geo.fViewMatrix;
+ const SkMatrix& drawMatrix = geo.fDrawMatrix;
- fDFGPFlags = viewMatrix.isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
- fDFGPFlags |= viewMatrix.isScaleTranslate() ? kScaleOnly_DistanceFieldEffectFlag : 0;
- fDFGPFlags |= viewMatrix.hasPerspective() ? kPerspective_DistanceFieldEffectFlag : 0;
+ fDFGPFlags = drawMatrix.isSimilarity() ? kSimilarity_DistanceFieldEffectFlag : 0;
+ fDFGPFlags |= drawMatrix.isScaleTranslate() ? kScaleOnly_DistanceFieldEffectFlag : 0;
+ fDFGPFlags |= drawMatrix.hasPerspective() ? kPerspective_DistanceFieldEffectFlag : 0;
fDFGPFlags |= fUseGammaCorrectDistanceTable ? kGammaCorrect_DistanceFieldEffectFlag : 0;
fDFGPFlags |= (kAliasedDistanceField_MaskType == fMaskType)
? kAliased_DistanceFieldEffectFlag
@@ -107,7 +107,7 @@
}
SkRect bounds;
- geo.fBlob->computeSubRunBounds(&bounds, *geo.fSubRunPtr, geo.fViewMatrix, geo.fX, geo.fY,
+ geo.fBlob->computeSubRunBounds(&bounds, *geo.fSubRunPtr, geo.fDrawMatrix, geo.fX, geo.fY,
fNeedsGlyphTransform);
// We don't have tight bounds on the glyph paths in device space. For the purposes of bounds
// we treat this as a set of non-AA rects rendered with a texture.
@@ -281,7 +281,7 @@
// if we have RGB, then we won't have any SkShaders so no need to use a localmatrix.
// TODO actually only invert if we don't have RGBA
SkMatrix localMatrix;
- if (this->usesLocalCoords() && !fGeoData[0].fViewMatrix.invert(&localMatrix)) {
+ if (this->usesLocalCoords() && !fGeoData[0].fDrawMatrix.invert(&localMatrix)) {
return;
}
@@ -313,7 +313,7 @@
FlushInfo flushInfo;
flushInfo.fFixedDynamicState = fixedDynamicState;
- bool vmPerspective = fGeoData[0].fViewMatrix.hasPerspective();
+ bool vmPerspective = fGeoData[0].fDrawMatrix.hasPerspective();
if (this->usesDistanceFields()) {
flushInfo.fGeometryProcessor = this->setupDfProcessor(target->allocator(),
*target->caps().shaderCaps(),
@@ -346,7 +346,7 @@
const Geometry& args = fGeoData[i];
// TODO4F: Preserve float colors
GrTextBlob::VertexRegenerator regenerator(
- resourceProvider, args.fSubRunPtr, args.fViewMatrix, args.fX, args.fY,
+ resourceProvider, args.fSubRunPtr, args.fDrawMatrix, args.fX, args.fY,
args.fColor.toBytes_RGBA(), target->deferredUploadTarget(), glyphCache,
atlasManager);
bool done = false;
@@ -366,19 +366,19 @@
clip_quads(args.fClipRect, currVertex, result.fFirstVertex, vertexStride,
result.fGlyphsRegenerated);
}
- if (fNeedsGlyphTransform && !args.fViewMatrix.isIdentity()) {
+ if (fNeedsGlyphTransform && !args.fDrawMatrix.isIdentity()) {
// We always do the distance field view matrix transformation after copying rather
// than during blob vertex generation time in the blob as handling successive
// arbitrary transformations would be complicated and accumulate error.
- if (args.fViewMatrix.hasPerspective()) {
+ if (args.fDrawMatrix.hasPerspective()) {
auto* pos = reinterpret_cast<SkPoint3*>(currVertex);
SkMatrixPriv::MapHomogeneousPointsWithStride(
- args.fViewMatrix, pos, vertexStride, pos, vertexStride,
+ args.fDrawMatrix, pos, vertexStride, pos, vertexStride,
result.fGlyphsRegenerated * kVerticesPerGlyph);
} else {
auto* pos = reinterpret_cast<SkPoint*>(currVertex);
SkMatrixPriv::MapPointsWithStride(
- args.fViewMatrix, pos, vertexStride,
+ args.fDrawMatrix, pos, vertexStride,
result.fGlyphsRegenerated * kVerticesPerGlyph);
}
}
@@ -462,8 +462,8 @@
return CombineResult::kCannotCombine;
}
- const SkMatrix& thisFirstMatrix = fGeoData[0].fViewMatrix;
- const SkMatrix& thatFirstMatrix = that->fGeoData[0].fViewMatrix;
+ const SkMatrix& thisFirstMatrix = fGeoData[0].fDrawMatrix;
+ const SkMatrix& thatFirstMatrix = that->fGeoData[0].fDrawMatrix;
if (this->usesLocalCoords() && !thisFirstMatrix.cheapEqualTo(thatFirstMatrix)) {
return CombineResult::kCannotCombine;
@@ -540,7 +540,7 @@
SkMatrix localMatrix = SkMatrix::I();
if (this->usesLocalCoords()) {
// If this fails we'll just use I().
- bool result = fGeoData[0].fViewMatrix.invert(&localMatrix);
+ bool result = fGeoData[0].fDrawMatrix.invert(&localMatrix);
(void)result;
}
diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index 62ac3c8..68545c0 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -29,7 +29,7 @@
static const int kIndicesPerGlyph = 6;
struct Geometry {
- SkMatrix fViewMatrix;
+ SkMatrix fDrawMatrix;
SkIRect fClipRect;
GrTextBlob* fBlob;
SkScalar fX;
diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index a541f26..52de8b4 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -21,19 +21,19 @@
#include <new>
static void calculate_translation(bool applyVM,
- const SkMatrix& newViewMatrix, SkScalar newX, SkScalar newY,
- const SkMatrix& currentViewMatrix, SkScalar currentX,
+ const SkMatrix& drawMatrix, SkScalar newX, SkScalar newY,
+ const SkMatrix& currentMatrix, SkScalar currentX,
SkScalar currentY, SkScalar* transX, SkScalar* transY) {
if (applyVM) {
- *transX = newViewMatrix.getTranslateX() +
- newViewMatrix.getScaleX() * (newX - currentX) +
- newViewMatrix.getSkewX() * (newY - currentY) -
- currentViewMatrix.getTranslateX();
+ *transX = drawMatrix.getTranslateX() +
+ drawMatrix.getScaleX() * (newX - currentX) +
+ drawMatrix.getSkewX() * (newY - currentY) -
+ currentMatrix.getTranslateX();
- *transY = newViewMatrix.getTranslateY() +
- newViewMatrix.getSkewY() * (newX - currentX) +
- newViewMatrix.getScaleY() * (newY - currentY) -
- currentViewMatrix.getTranslateY();
+ *transY = drawMatrix.getTranslateY() +
+ drawMatrix.getSkewY() * (newX - currentX) +
+ drawMatrix.getScaleY() * (newY - currentY) -
+ currentMatrix.getTranslateY();
} else {
*transX = newX - currentX;
*transY = newY - currentY;
@@ -99,7 +99,7 @@
void init(const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
// This function assumes the translation will be applied before it is called again
- void computeTranslation(const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+ void computeTranslation(const SkMatrix& drawMatrix, SkScalar x, SkScalar y,
SkScalar* transX, SkScalar* transY);
bool drawAsDistanceFields() const;
@@ -133,7 +133,7 @@
uint64_t fAtlasGeneration{GrDrawOpAtlas::kInvalidAtlasGeneration};
SkScalar fX;
SkScalar fY;
- SkMatrix fCurrentViewMatrix;
+ SkMatrix fCurrentMatrix;
std::vector<PathGlyph> fPaths;
}; // SubRun
@@ -151,7 +151,7 @@
, fColor{textBlob->fColor}
, fX{textBlob->fInitialOrigin.x()}
, fY{textBlob->fInitialOrigin.y()}
- , fCurrentViewMatrix{textBlob->fInitialViewMatrix} {
+ , fCurrentMatrix{textBlob->fInitialMatrix} {
SkASSERT(type != kTransformedPath);
textBlob->insertSubRun(this);
}
@@ -177,7 +177,7 @@
bool hasW = this->hasW();
GrColor color = this->color();
// glyphs drawn in perspective must always have a w coord.
- SkASSERT(hasW || !fBlob->fInitialViewMatrix.hasPerspective());
+ SkASSERT(hasW || !fBlob->fInitialMatrix.hasPerspective());
size_t vertexStride = GetVertexStride(fMaskFormat, hasW);
// We always write the third position component used by SDFs. If it is unused it gets
// overwritten. Similarly, we always write the color and the blob will later overwrite it
@@ -238,18 +238,18 @@
}
void GrTextBlob::SubRun::init(const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
- fCurrentViewMatrix = viewMatrix;
+ fCurrentMatrix = viewMatrix;
fX = x;
fY = y;
}
-void GrTextBlob::SubRun::computeTranslation(const SkMatrix& viewMatrix,
+void GrTextBlob::SubRun::computeTranslation(const SkMatrix& drawMatrix,
SkScalar x, SkScalar y, SkScalar* transX,
SkScalar* transY) {
// Don't use the matrix to translate on distance field for fallback subruns.
- calculate_translation(!this->drawAsDistanceFields() && !this->needsTransform(), viewMatrix,
- x, y, fCurrentViewMatrix, fX, fY, transX, transY);
- fCurrentViewMatrix = viewMatrix;
+ calculate_translation(!this->drawAsDistanceFields() && !this->needsTransform(), drawMatrix,
+ x, y, fCurrentMatrix, fX, fY, transX, transY);
+ fCurrentMatrix = drawMatrix;
fX = x;
fY = y;
}
@@ -283,14 +283,14 @@
sk_sp<GrTextBlob> GrTextBlob::Make(const SkGlyphRunList& glyphRunList,
GrStrikeCache* strikeCache,
- const SkMatrix& viewMatrix,
+ const SkMatrix& drawMatrix,
GrColor color,
bool forceWForDistanceFields) {
static_assert(sizeof(ARGB2DVertex) <= sizeof(Mask2DVertex));
static_assert(alignof(ARGB2DVertex) <= alignof(Mask2DVertex));
size_t quadSize = sizeof(Mask2DVertex) * kVerticesPerGlyph;
- if (viewMatrix.hasPerspective() || forceWForDistanceFields) {
+ if (drawMatrix.hasPerspective() || forceWForDistanceFields) {
static_assert(sizeof(ARGB3DVertex) <= sizeof(SDFT3DVertex));
static_assert(alignof(ARGB3DVertex) <= alignof(SDFT3DVertex));
quadSize = sizeof(SDFT3DVertex) * kVerticesPerGlyph;
@@ -316,7 +316,7 @@
SkColor initialLuminance = SkPaintPriv::ComputeLuminanceColor(glyphRunList.paint());
sk_sp<GrTextBlob> blob{new (allocation) GrTextBlob{
- arenaSize, strikeCache, viewMatrix, glyphRunList.origin(),
+ arenaSize, strikeCache, drawMatrix, glyphRunList.origin(),
color, initialLuminance, forceWForDistanceFields}};
return blob;
@@ -341,7 +341,7 @@
return SkToBool(fTextType & kHasDistanceField_TextType);
}
bool GrTextBlob::hasBitmap() const { return SkToBool(fTextType & kHasBitmap_TextType); }
-bool GrTextBlob::hasPerspective() const { return fInitialViewMatrix.hasPerspective(); }
+bool GrTextBlob::hasPerspective() const { return fInitialMatrix.hasPerspective(); }
void GrTextBlob::setHasDistanceField() { fTextType |= kHasDistanceField_TextType; }
void GrTextBlob::setHasBitmap() { fTextType |= kHasBitmap_TextType; }
@@ -365,7 +365,7 @@
bool GrTextBlob::mustRegenerate(const SkPaint& paint, bool anyRunHasSubpixelPosition,
const SkMaskFilterBase::BlurRec& blurRec,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y) {
// If we have LCD text then our canonical color will be set to transparent, in this case we have
// to regenerate the blob on any color change
// We use the grPaint to get any color filter effects
@@ -374,12 +374,12 @@
return true;
}
- if (fInitialViewMatrix.hasPerspective() != viewMatrix.hasPerspective()) {
+ if (fInitialMatrix.hasPerspective() != drawMatrix.hasPerspective()) {
return true;
}
/** This could be relaxed for blobs with only distance field glyphs. */
- if (fInitialViewMatrix.hasPerspective() && !fInitialViewMatrix.cheapEqualTo(viewMatrix)) {
+ if (fInitialMatrix.hasPerspective() && !fInitialMatrix.cheapEqualTo(drawMatrix)) {
return true;
}
@@ -401,14 +401,14 @@
// for mixed blobs if this becomes an issue.
if (this->hasBitmap() && this->hasDistanceField()) {
// Identical view matrices and we can reuse in all cases
- return !(fInitialViewMatrix.cheapEqualTo(viewMatrix) && SkPoint{x, y} == fInitialOrigin);
+ return !(fInitialMatrix.cheapEqualTo(drawMatrix) && SkPoint{x, y} == fInitialOrigin);
}
if (this->hasBitmap()) {
- if (fInitialViewMatrix.getScaleX() != viewMatrix.getScaleX() ||
- fInitialViewMatrix.getScaleY() != viewMatrix.getScaleY() ||
- fInitialViewMatrix.getSkewX() != viewMatrix.getSkewX() ||
- fInitialViewMatrix.getSkewY() != viewMatrix.getSkewY()) {
+ if (fInitialMatrix.getScaleX() != drawMatrix.getScaleX() ||
+ fInitialMatrix.getScaleY() != drawMatrix.getScaleY() ||
+ fInitialMatrix.getSkewX() != drawMatrix.getSkewX() ||
+ fInitialMatrix.getSkewY() != drawMatrix.getSkewY()) {
return true;
}
@@ -421,22 +421,22 @@
// This cool bit of math will determine the necessary translation to apply to the
// already generated vertex coordinates to move them to the correct position.
// Figure out the translation in view space given a translation in source space.
- SkScalar transX = viewMatrix.getTranslateX() +
- viewMatrix.getScaleX() * (x - fInitialOrigin.x()) +
- viewMatrix.getSkewX() * (y - fInitialOrigin.y()) -
- fInitialViewMatrix.getTranslateX();
- SkScalar transY = viewMatrix.getTranslateY() +
- viewMatrix.getSkewY() * (x - fInitialOrigin.x()) +
- viewMatrix.getScaleY() * (y - fInitialOrigin.y()) -
- fInitialViewMatrix.getTranslateY();
+ SkScalar transX = drawMatrix.getTranslateX() +
+ drawMatrix.getScaleX() * (x - fInitialOrigin.x()) +
+ drawMatrix.getSkewX() * (y - fInitialOrigin.y()) -
+ fInitialMatrix.getTranslateX();
+ SkScalar transY = drawMatrix.getTranslateY() +
+ drawMatrix.getSkewY() * (x - fInitialOrigin.x()) +
+ drawMatrix.getScaleY() * (y - fInitialOrigin.y()) -
+ fInitialMatrix.getTranslateY();
if (!SkScalarIsInt(transX) || !SkScalarIsInt(transY)) {
return true;
}
} else if (this->hasDistanceField()) {
// A scale outside of [blob.fMaxMinScale, blob.fMinMaxScale] would result in a different
// distance field being generated, so we have to regenerate in those cases
- SkScalar newMaxScale = viewMatrix.getMaxScale();
- SkScalar oldMaxScale = fInitialViewMatrix.getMaxScale();
+ SkScalar newMaxScale = drawMatrix.getMaxScale();
+ SkScalar oldMaxScale = fInitialMatrix.getMaxScale();
SkScalar scaleAdjust = newMaxScale / oldMaxScale;
if (scaleAdjust < fMaxMinScale || scaleAdjust > fMinMaxScale) {
return true;
@@ -452,7 +452,7 @@
void GrTextBlob::flush(GrTextTarget* target, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable,
const SkPaint& paint, const SkPMColor4f& filteredColor, const GrClip& clip,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y) {
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y) {
for (SubRun* subRun = fFirstSubRun; subRun != nullptr; subRun = subRun->fNextSubRun) {
if (subRun->drawAsPaths()) {
@@ -471,7 +471,7 @@
SkVector originShift = SkPoint{x, y} - fInitialOrigin;
for (const auto& pathGlyph : subRun->fPaths) {
- SkMatrix ctm{viewMatrix};
+ SkMatrix ctm{drawMatrix};
SkMatrix pathMatrix = SkMatrix::MakeScale(
subRun->fStrikeSpec.strikeToSourceRatio());
// Shift the original glyph location in source space to the position of the new
@@ -520,7 +520,7 @@
skipClip = true;
// We only need to do clipping work if the subrun isn't contained by the clip
SkRect subRunBounds;
- this->computeSubRunBounds(&subRunBounds, *subRun, viewMatrix, x, y, false);
+ this->computeSubRunBounds(&subRunBounds, *subRun, drawMatrix, x, y, false);
if (!clipRRect.getBounds().contains(subRunBounds)) {
// If the subrun is completely outside, don't add an op for it
if (!clipRRect.getBounds().intersects(subRunBounds)) {
@@ -533,7 +533,7 @@
}
if (submitOp) {
- auto op = this->makeOp(*subRun, glyphCount, viewMatrix, x, y,
+ auto op = this->makeOp(*subRun, glyphCount, drawMatrix, x, y,
clipRect, paint, filteredColor, props, distanceAdjustTable,
target);
if (op) {
@@ -549,8 +549,8 @@
}
}
-void GrTextBlob::computeSubRunBounds(SkRect* outBounds, const GrTextBlob::SubRun& subRun,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+void GrTextBlob::computeSubRunBounds(SkRect* outBounds, const SubRun& subRun,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y,
bool needsGlyphTransform) {
// We don't yet position distance field text on the cpu, so we have to map the vertex bounds
// into device space.
@@ -562,17 +562,17 @@
// Distance field text is positioned with the (X,Y) as part of the glyph position,
// and currently the view matrix is applied on the GPU
outBounds->offset(SkPoint{x, y} - fInitialOrigin);
- viewMatrix.mapRect(outBounds);
+ drawMatrix.mapRect(outBounds);
} else {
// Bitmap text is fully positioned on the CPU, and offset by an (X,Y) translate in
// device space.
- SkMatrix boundsMatrix = fInitialViewMatrixInverse;
+ SkMatrix boundsMatrix = fInitialMatrixInverse;
boundsMatrix.postTranslate(-fInitialOrigin.x(), -fInitialOrigin.y());
boundsMatrix.postTranslate(x, y);
- boundsMatrix.postConcat(viewMatrix);
+ boundsMatrix.postConcat(drawMatrix);
boundsMatrix.mapRect(outBounds);
// Due to floating point numerical inaccuracies, we have to round out here
@@ -584,13 +584,13 @@
size_t GrTextBlob::size() const { return fSize; }
std::unique_ptr<GrDrawOp> GrTextBlob::test_makeOp(
- int glyphCount, const SkMatrix& viewMatrix,
+ int glyphCount, const SkMatrix& drawMatrix,
SkScalar x, SkScalar y, const SkPaint& paint, const SkPMColor4f& filteredColor,
const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable,
GrTextTarget* target) {
SubRun* info = fFirstSubRun;
SkIRect emptyRect = SkIRect::MakeEmpty();
- return this->makeOp(*info, glyphCount, viewMatrix, x, y, emptyRect,
+ return this->makeOp(*info, glyphCount, drawMatrix, x, y, emptyRect,
paint, filteredColor, props, distanceAdjustTable, target);
}
@@ -673,15 +673,15 @@
GrTextBlob::GrTextBlob(size_t allocSize,
GrStrikeCache* strikeCache,
- const SkMatrix& viewMatrix,
+ const SkMatrix& drawMatrix,
SkPoint origin,
GrColor color,
SkColor initialLuminance,
bool forceWForDistanceFields)
: fSize{allocSize}
, fStrikeCache{strikeCache}
- , fInitialViewMatrix{viewMatrix}
- , fInitialViewMatrixInverse{make_inverse(viewMatrix)}
+ , fInitialMatrix{drawMatrix}
+ , fInitialMatrixInverse{make_inverse(drawMatrix)}
, fInitialOrigin{origin}
, fForceWForDistanceFields{forceWForDistanceFields}
, fColor{color}
@@ -700,13 +700,13 @@
std::unique_ptr<GrAtlasTextOp> GrTextBlob::makeOp(
SubRun& info, int glyphCount,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
const SkPaint& paint, const SkPMColor4f& filteredColor, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable, GrTextTarget* target) {
GrMaskFormat format = info.maskFormat();
GrPaint grPaint;
- target->makeGrPaint(info.maskFormat(), paint, viewMatrix, &grPaint);
+ target->makeGrPaint(info.maskFormat(), paint, drawMatrix, &grPaint);
std::unique_ptr<GrAtlasTextOp> op;
if (info.drawAsDistanceFields()) {
// TODO: Can we be even smarter based on the dest transfer function?
@@ -719,7 +719,7 @@
info.needsTransform());
}
GrAtlasTextOp::Geometry& geometry = op->geometry();
- geometry.fViewMatrix = viewMatrix;
+ geometry.fDrawMatrix = drawMatrix;
geometry.fClipRect = clipRect;
geometry.fBlob = SkRef(this);
geometry.fSubRunPtr = &info;
@@ -864,20 +864,20 @@
GrTextBlob::VertexRegenerator::VertexRegenerator(GrResourceProvider* resourceProvider,
GrTextBlob::SubRun* subRun,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y,
GrColor color,
GrDeferredUploadTarget* uploadTarget,
GrStrikeCache* grStrikeCache,
GrAtlasManager* fullAtlasManager)
: fResourceProvider(resourceProvider)
- , fViewMatrix(viewMatrix)
+ , fDrawMatrix(drawMatrix)
, fUploadTarget(uploadTarget)
, fGrStrikeCache(grStrikeCache)
, fFullAtlasManager(fullAtlasManager)
, fSubRun(subRun)
, fColor(color) {
// Compute translation if any
- fSubRun->computeTranslation(fViewMatrix, x, y, &fTransX, &fTransY);
+ fSubRun->computeTranslation(fDrawMatrix, x, y, &fTransX, &fTransY);
// Because the GrStrikeCache may evict the strike a blob depends on using for
// generating its texture coords, we have to track whether or not the strike has
diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 905fe6d..632061a 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -91,7 +91,7 @@
// adding SubRuns.
static sk_sp<GrTextBlob> Make(const SkGlyphRunList& glyphRunList,
GrStrikeCache* strikeCache,
- const SkMatrix& viewMatrix,
+ const SkMatrix& drawMatrix,
GrColor color,
bool forceWForDistanceFields);
@@ -113,15 +113,15 @@
static size_t GetVertexStride(GrMaskFormat maskFormat, bool hasWCoord);
bool mustRegenerate(const SkPaint&, bool, const SkMaskFilterBase::BlurRec& blurRec,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y);
void flush(GrTextTarget*, const SkSurfaceProps& props,
const GrDistanceFieldAdjustTable* distanceAdjustTable,
const SkPaint& paint, const SkPMColor4f& filteredColor, const GrClip& clip,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y);
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y);
void computeSubRunBounds(SkRect* outBounds, const SubRun& subRun,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y,
bool needsGlyphTransform);
// Normal text mask, SDFT, or color.
@@ -153,7 +153,7 @@
// Internal test methods
std::unique_ptr<GrDrawOp> test_makeOp(int glyphCount,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y,
const SkPaint& paint, const SkPMColor4f& filteredColor,
const SkSurfaceProps&, const GrDistanceFieldAdjustTable*,
GrTextTarget*);
@@ -196,7 +196,7 @@
GrTextBlob(size_t allocSize,
GrStrikeCache* strikeCache,
- const SkMatrix& viewMatrix,
+ const SkMatrix& drawMatrix,
SkPoint origin,
GrColor color,
SkColor initialLuminance,
@@ -206,7 +206,7 @@
std::unique_ptr<GrAtlasTextOp> makeOp(
SubRun& info, int glyphCount,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y, const SkIRect& clipRect,
const SkPaint& paint, const SkPMColor4f& filteredColor, const SkSurfaceProps&,
const GrDistanceFieldAdjustTable*, GrTextTarget*);
@@ -235,8 +235,8 @@
// same text blob. We record the initial view matrix and initial offsets(x,y), because we
// record vertex bounds relative to these numbers. When blobs are reused with new matrices,
// we need to return to source space so we can update the vertex bounds appropriately.
- const SkMatrix fInitialViewMatrix;
- const SkMatrix fInitialViewMatrixInverse;
+ const SkMatrix fInitialMatrix;
+ const SkMatrix fInitialMatrixInverse;
// Initial position of this blob. Used for calculating position differences when reusing this
// blob.
@@ -282,7 +282,7 @@
* SkGlyphCache.
*/
VertexRegenerator(GrResourceProvider*, GrTextBlob::SubRun* subRun,
- const SkMatrix& viewMatrix, SkScalar x, SkScalar y, GrColor color,
+ const SkMatrix& drawMatrix, SkScalar x, SkScalar y, GrColor color,
GrDeferredUploadTarget*, GrStrikeCache*, GrAtlasManager*);
struct Result {
@@ -310,7 +310,7 @@
bool doRegen(Result*, bool regenPos, bool regenCol, bool regenTexCoords, bool regenGlyphs);
GrResourceProvider* fResourceProvider;
- const SkMatrix& fViewMatrix;
+ const SkMatrix& fDrawMatrix;
GrDeferredUploadTarget* fUploadTarget;
GrStrikeCache* fGrStrikeCache;
GrAtlasManager* fFullAtlasManager;
