AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused parameter from makeAtlasTextOp

Browse Source 
The SubRunOwner parameter was used exclusively for the
*NoCache SubRun system. This system has been removed from
the code.

Change-Id: Ic3b4a1e4f49dcbd9b297e5011d2e96dd163a9acb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/536437
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2022-05-03 09:01:35 -04:00 committed by SkCQ
parent 39259f5072
commit 8020a24a8c
3 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/ganesh/ops/AtlasTextOp.cpp
View File

@ -485,7 +485,6 @@ GrGeometryProcessor* AtlasTextOp::setupDfProcessor(SkArenaAlloc* arena,
#if GR_TEST_UTILS
#include "src/gpu/ganesh/GrDrawOpTest.h"
GrOp::Owner AtlasTextOp::CreateOpTestingOnly(SurfaceDrawContext* sdc,
const SkPaint& skPaint,
const SkFont& font,
@ -519,16 +518,14 @@ GrOp::Owner AtlasTextOp::CreateOpTestingOnly(SurfaceDrawContext* sdc,
GrOp::Owner op;
std::tie(std::ignore, op) = subRun->makeAtlasTextOp(
nullptr, mtxProvider, glyphRunList.origin(), skPaint, sdc, nullptr);
nullptr, mtxProvider, glyphRunList.origin(), skPaint, sdc);
return op;
}
#endif
} // namespace skgpu::v1
#if GR_TEST_UTILS
GR_DRAW_OP_TEST_DEFINE(AtlasTextOp) {
SkMatrixProvider matrixProvider(GrTest::TestMatrixInvertible(random));
@ -555,5 +552,4 @@ GR_DRAW_OP_TEST_DEFINE(AtlasTextOp) {
return skgpu::v1::AtlasTextOp::CreateOpTestingOnly(sdc, skPaint, font, matrixProvider,
text, xInt, yInt);
}
#endif

27
src/gpu/ganesh/text/GrTextBlob.cpp
View File

@ -1108,8 +1108,7 @@ public:
const SkMatrixProvider& viewMatrix,
SkPoint,
const SkPaint&,
skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner) const override;
skgpu::v1::SurfaceDrawContext*) const override;
void testingOnly_packedGlyphIDToGlyph(GrStrikeCache *cache) const override;
@ -1292,8 +1291,7 @@ void DirectMaskSubRun::draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc) const {
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, drawOrigin, paint, sdc, nullptr);
auto[drawingClip, op] = this->makeAtlasTextOp(clip, viewMatrix, drawOrigin, paint, sdc);
if (op != nullptr) {
sdc->addDrawOp(drawingClip, std::move(op));
}
@ -1303,8 +1301,7 @@ std::tuple<const GrClip*, GrOp::Owner> DirectMaskSubRun::makeAtlasTextOp(const G
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner subRunOwner) const {
skgpu::v1::SurfaceDrawContext* sdc) const {
SkASSERT(this->glyphCount() != 0);
const SkMatrix& drawMatrix = viewMatrix.localToDevice();
const SkMatrix& positionMatrix = position_matrix(drawMatrix, drawOrigin);
@ -1542,8 +1539,7 @@ public:
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint&,
skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner) const override;
skgpu::v1::SurfaceDrawContext*) const override;
int unflattenSize() const override;
@ -1632,8 +1628,7 @@ void TransformedMaskSubRun::draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc) const {
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, drawOrigin, paint, sdc, nullptr);
auto[drawingClip, op] = this->makeAtlasTextOp(clip, viewMatrix, drawOrigin, paint, sdc);
if (op != nullptr) {
sdc->addDrawOp(drawingClip, std::move(op));
}
@ -1644,8 +1639,7 @@ TransformedMaskSubRun::makeAtlasTextOp(const GrClip* clip,
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const {
skgpu::v1::SurfaceDrawContext* sdc) const {
SkASSERT(this->glyphCount() != 0);
const SkMatrix& drawMatrix = viewMatrix.localToDevice();
@ -1755,8 +1749,7 @@ public:
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint&,
skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner) const override;
skgpu::v1::SurfaceDrawContext*) const override;
int unflattenSize() const override;
@ -1879,8 +1872,7 @@ void SDFTSubRun::draw(SkCanvas*,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc) const {
auto[drawingClip, op] = this->makeAtlasTextOp(
clip, viewMatrix, drawOrigin, paint, sdc, nullptr);
auto[drawingClip, op] = this->makeAtlasTextOp(clip, viewMatrix, drawOrigin, paint, sdc);
if (op != nullptr) {
sdc->addDrawOp(drawingClip, std::move(op));
}
@ -1919,8 +1911,7 @@ SDFTSubRun::makeAtlasTextOp(const GrClip* clip,
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint& paint,
skgpu::v1::SurfaceDrawContext* sdc,
GrAtlasSubRunOwner) const {
skgpu::v1::SurfaceDrawContext* sdc) const {
SkASSERT(this->glyphCount() != 0);
const SkMatrix& drawMatrix = viewMatrix.localToDevice();

3
src/gpu/ganesh/text/GrTextBlob.h
View File

@ -73,8 +73,7 @@ public:
const SkMatrixProvider& viewMatrix,
SkPoint drawOrigin,
const SkPaint&,
skgpu::v1::SurfaceDrawContext*,
GrAtlasSubRunOwner subRun) const = 0;
skgpu::v1::SurfaceDrawContext*) const = 0;
virtual void fillVertexData(
void* vertexDst, int offset, int count,