diff options
| author |  jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-31 21:34:25 +0000 |
|---|---|---|
| committer | jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-31 21:34:25 +0000 |
| commit | a63389843dd18003382d61c2e4610af09ed07d38 (patch) | |
| tree | e43d25c69c3afa3955679a20c1199ad2f7e2c614 /src/gpu/GrTextContext.cpp | |
| parent | 29dea74ca6ad6044dc9a90f8ca55092b34945ce4 (diff) | |
Change vertex buffer allocator functions to take size rather than layout, take two.
Resubmission of r7498.
https://codereview.appspot.com/7228078
git-svn-id: http://skia.googlecode.com/svn/trunk@7501 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrTextContext.cpp')
| -rw-r--r-- | src/gpu/GrTextContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp index 206f4ca3fb..97e92fa1ef 100644 --- a/src/gpu/GrTextContext.cpp +++ b/src/gpu/GrTextContext.cpp @@ -204,7 +204,7 @@ HAS_ATLAS: // a number of verts to reserve and whether to perform a flush. fMaxVertices = kMinRequestedVerts; bool flush = (NULL != fDrawTarget) && - fDrawTarget->geometryHints(fVertexLayout, + fDrawTarget->geometryHints(GrDrawState::VertexSize(fVertexLayout), &fMaxVertices, NULL); if (flush) { @@ -214,7 +214,7 @@ HAS_ATLAS: fDrawTarget = fContext->getTextTarget(fPaint); fMaxVertices = kDefaultRequestedVerts; // ignore return, no point in flushing again. - fDrawTarget->geometryHints(fVertexLayout, + fDrawTarget->geometryHints(GrDrawState::VertexSize(fVertexLayout), &fMaxVertices, NULL); |