commit 92cc580c27af2c725bb2d3638a236572e77266af
author Herb Derby <herb@google.com> Thu Jun 04 09:59:38 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 04 17:36:46 2020 +0000
tree d61680da6e874ff42e948d8c22b3d7dc2fe802cb
parent eed56f0fe5a2101361439023aa083724b7e72296

Remove unused vertex filler

Change-Id: Ie46e1b4cfb76b672eef60a87ea8ca94106052a00
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/294296
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>

src/gpu/ops/GrAtlasTextOp.cpp

diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 8bfda87..32e1d85 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -62,17 +62,6 @@
     this->setBounds(bounds, HasAABloat::kNo, IsHairline::kNo);
 }
 
-// Entry point just for the SkAtlasTextTarget
-std::unique_ptr<GrTextBlob::Mask3DVertex[][4]> GrAtlasTextOp::Geometry::textTargetCreateVertexData(
-        int offset, int count) const {
-    std::unique_ptr<GrTextBlob::Mask3DVertex[][4]> data{new GrTextBlob::Mask3DVertex[count][4]};
-
-    fSubRunPtr->fillTextTargetVertexData(data.get(), offset, count, fColor.toBytes_RGBA(),
-                                         fDrawOrigin);
-
-    return data;
-}
-
 void GrAtlasTextOp::Geometry::fillVertexData(void *dst, int offset, int count) const {
     fSubRunPtr->fillVertexData(dst, offset, count, fColor.toBytes_RGBA(),
                                fDrawMatrix, fDrawOrigin, fClipRect);

src/gpu/ops/GrAtlasTextOp.h

diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h
index b8fb9e3..16020d0 100644
--- a/src/gpu/ops/GrAtlasTextOp.h
+++ b/src/gpu/ops/GrAtlasTextOp.h
@@ -34,8 +34,7 @@
         SkPoint     fDrawOrigin;
         GrTextBlob::SubRun* fSubRunPtr;
         SkPMColor4f fColor;
-        std::unique_ptr<GrTextBlob::Mask3DVertex[][4]> textTargetCreateVertexData(
-                int offset, int count) const;
+
         void fillVertexData(void* dst, int offset, int count) const;
     };
 

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 3356297..719d5c4 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -261,30 +261,6 @@
     }
 }
 
-// Note: this method is only used with SkAtlasTextTarget. The SkAtlasTextTarget only uses SDF,
-// and does the rectangle transforms on the GPU. For the normal text execution path see
-// fillVertexData.
-void GrTextBlob::SubRun::fillTextTargetVertexData(
-        Mask3DVertex vertexDst[][4], int offset, int count, GrColor color, SkPoint origin) const {
-    SkScalar strikeToSource = fStrikeSpec.strikeToSourceRatio();
-    SkPoint inset = {SK_DistanceFieldInset, SK_DistanceFieldInset};
-    for (auto[dst, vertexData] : SkMakeZip(vertexDst, fVertexData.subspan(offset, count))) {
-        auto[glyph, pos, rect] = vertexData;
-        auto [l, t, r, b] = rect;
-        SkPoint sLT = (SkPoint::Make(l, t) + inset) * strikeToSource + pos + origin,
-                sRB = (SkPoint::Make(r, b) - inset) * strikeToSource + pos + origin;
-        SkPoint3 lt = SkPoint3{sLT.x(), sLT.y(), 1.f},
-                 lb = SkPoint3{sLT.x(), sRB.y(), 1.f},
-                 rt = SkPoint3{sRB.x(), sLT.y(), 1.f},
-                 rb = SkPoint3{sRB.x(), sRB.y(), 1.f};
-        auto[al, at, ar, ab] = glyph.grGlyph->fAtlasLocator.getUVs(SK_DistanceFieldInset);
-        dst[0] = {lt, color, {al, at}};  // L,T
-        dst[1] = {lb, color, {al, ab}};  // L,B
-        dst[2] = {rt, color, {ar, at}};  // R,T
-        dst[3] = {rb, color, {ar, ab}};  // R,B
-    }
-}
-
 int GrTextBlob::SubRun::glyphCount() const {
     return fVertexData.count();
 }

src/gpu/text/GrTextBlob.h

diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/text/GrTextBlob.h
index 99fc32e..c8e5a2d 100644
--- a/src/gpu/text/GrTextBlob.h
+++ b/src/gpu/text/GrTextBlob.h
@@ -323,13 +323,6 @@
             GrColor color, const SkMatrix& drawMatrix, SkPoint drawOrigin,
             SkIRect clip) const;
 
-    void fillTextTargetVertexData(
-            Mask3DVertex vertexDst[][4],
-            int offset,
-            int count,
-            GrColor color,
-            SkPoint origin) const;
-
     int glyphCount() const;
 
     bool drawAsDistanceFields() const;