src/gpu/batches/GrAtlasTextBatch.cpp - Issue 1831133004: Revert of Consolidate GPU buffer implementations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/batches/GrAtlasTextBatch.cpp

Issue 1831133004: Revert of Consolidate GPU buffer implementations (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/gpu/batches/GrAtlasTextBatch.cpp

diff --git a/src/gpu/batches/GrAtlasTextBatch.cpp b/src/gpu/batches/GrAtlasTextBatch.cpp

index 654643d3399e33308011be09b474a3d78e39c933..8b890394060da5f18d4f2df9aef291ee1f3463f1 100644

--- a/src/gpu/batches/GrAtlasTextBatch.cpp

+++ b/src/gpu/batches/GrAtlasTextBatch.cpp

@@ -119,7 +119,7 @@

target->initDraw(gp);

int glyphCount = this->numGlyphs();

- const GrBuffer* vertexBuffer;

+ const GrVertexBuffer* vertexBuffer;

void* vertices = target->makeVertexSpace(vertexStride,

glyphCount * kVerticesPerGlyph,

@@ -181,8 +181,7 @@

void GrAtlasTextBatch::flush(GrVertexBatch::Target* target, FlushInfo* flushInfo) const {

GrMesh mesh;

- int maxGlyphsPerDraw =

- static_cast<int>(flushInfo->fIndexBuffer->gpuMemorySize() / sizeof(uint16_t) / 6);

+ int maxGlyphsPerDraw = flushInfo->fIndexBuffer->maxQuads();

mesh.initInstanced(kTriangles_GrPrimitiveType, flushInfo->fVertexBuffer,

flushInfo->fIndexBuffer, flushInfo->fVertexOffset,

kVerticesPerGlyph, kIndicesPerGlyph, flushInfo->fGlyphsToFlush,

« no previous file with comments | « src/gpu/batches/GrAtlasTextBatch.h ('k') | src/gpu/batches/GrDefaultPathRenderer.cpp » ('j') | no next file with comments »