Change interface on GrDrawTarget to reserve vtx/idx space at same time
Review URL: https://codereview.appspot.com/5796066/
git-svn-id: http://skia.googlecode.com/svn/trunk@3371 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index c22b203..62c894e 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -255,8 +255,8 @@
// a number of verts to reserve and whether to perform a flush.
fMaxVertices = kMinRequestedVerts;
bool flush = fDrawTarget->geometryHints(fVertexLayout,
- &fMaxVertices,
- NULL);
+ &fMaxVertices,
+ NULL);
if (flush) {
this->flushGlyphs();
fContext->flushText();
@@ -275,9 +275,12 @@
// don't exceed the limit of the index buffer
fMaxVertices = maxQuadVertices;
}
- bool success = fDrawTarget->reserveVertexSpace(fVertexLayout,
+ bool success = fDrawTarget->reserveVertexAndIndexSpace(
+ fVertexLayout,
fMaxVertices,
- GrTCast<void**>(&fVertices));
+ 0,
+ GrTCast<void**>(&fVertices),
+ NULL);
GrAlwaysAssert(success);
}