diff options
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/ops/GrAtlasTextOp.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index f0a9300d9e..2383510a47 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -318,19 +318,19 @@ bool GrAtlasTextOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { // Keep the batch vertex buffer size below 32K so we don't have to create a special one // We use the largest possible vertex size for this static const int kVertexSize = sizeof(SkPoint) + sizeof(SkColor) + 2 * sizeof(uint16_t); - static const int kMaxGlyphs = 32768 / (4 * kVertexSize); + static const int kMaxGlyphs = 32768 / (kVerticesPerGlyph * kVertexSize); if (this->fNumGlyphs + that->fNumGlyphs > kMaxGlyphs) { return false; } fNumGlyphs += that->numGlyphs(); - // Reallocate space for geo data if necessary and then import that's geo data. + // Reallocate space for geo data if necessary and then import that geo's data. int newGeoCount = that->fGeoCount + fGeoCount; // We reallocate at a rate of 1.5x to try to get better total memory usage if (newGeoCount > fGeoDataAllocSize) { - int newAllocSize = fGeoDataAllocSize + fGeoDataAllocSize/2; + int newAllocSize = fGeoDataAllocSize + fGeoDataAllocSize / 2; while (newAllocSize < newGeoCount) { newAllocSize += newAllocSize / 2; } diff --git a/src/gpu/ops/GrAtlasTextOp.h b/src/gpu/ops/GrAtlasTextOp.h index 622b993d44..1814676445 100644 --- a/src/gpu/ops/GrAtlasTextOp.h +++ b/src/gpu/ops/GrAtlasTextOp.h @@ -32,8 +32,8 @@ public: Blob* fBlob; SkScalar fX; SkScalar fY; - int fRun; - int fSubRun; + uint16_t fRun; + uint16_t fSubRun; GrColor fColor; }; @@ -118,7 +118,7 @@ public: private: // The minimum number of Geometry we will try to allocate. - static constexpr auto kMinGeometryAllocated = 4; + static constexpr auto kMinGeometryAllocated = 12; GrAtlasTextOp(GrPaint&& paint) : INHERITED(ClassID()) |