make pathrenderers release their geometry before returning
Review URL: http://codereview.appspot.com/5753073/
git-svn-id: http://skia.googlecode.com/svn/trunk@3335 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 029d493..d1715e9 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -505,15 +505,12 @@
return false;
}
- if (!target->reserveVertexSpace(layout,
- vCount,
- reinterpret_cast<void**>(&verts))) {
+ GrDrawTarget::AutoReleaseGeometry arg(target, layout, vCount, iCount);
+ if (!arg.succeeded()) {
return false;
}
- if (!target->reserveIndexSpace(iCount, reinterpret_cast<void**>(&idxs))) {
- target->resetVertexSource();
- return false;
- }
+ verts = reinterpret_cast<QuadVertex*>(arg.vertices());
+ idxs = reinterpret_cast<uint16_t*>(arg.indices());
create_vertices(segments, fanPt, verts, idxs);
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 3ed4488..527c18b 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -500,12 +500,14 @@
}
-bool GrAAHairLinePathRenderer::createGeom(const SkPath& path,
- const GrVec* translate,
- GrDrawTarget* target,
- GrDrawState::StageMask stageMask,
- int* lineCnt,
- int* quadCnt) {
+bool GrAAHairLinePathRenderer::createGeom(
+ const SkPath& path,
+ const GrVec* translate,
+ GrDrawTarget* target,
+ GrDrawState::StageMask stageMask,
+ int* lineCnt,
+ int* quadCnt,
+ GrDrawTarget::AutoReleaseGeometry* arg) {
const GrDrawState& drawState = target->getDrawState();
int rtHeight = drawState.getRenderTarget()->height();
@@ -542,11 +544,12 @@
GrAssert(sizeof(Vertex) == GrDrawTarget::VertexSize(layout));
- Vertex* verts;
- if (!target->reserveVertexSpace(layout, vertCnt, (void**)&verts)) {
+ if (!arg->set(target, layout, vertCnt, 0)) {
return false;
}
+ Vertex* verts = reinterpret_cast<Vertex*>(arg->vertices());
+
const GrMatrix* toDevice = NULL;
const GrMatrix* toSrc = NULL;
GrMatrix ivm;
@@ -597,13 +600,14 @@
int lineCnt;
int quadCnt;
-
+ GrDrawTarget::AutoReleaseGeometry arg;
if (!this->createGeom(path,
translate,
target,
stageMask,
&lineCnt,
- &quadCnt)) {
+ &quadCnt,
+ &arg)) {
return false;
}
diff --git a/src/gpu/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
index 33b7332..6dd9ea9 100644
--- a/src/gpu/GrAAHairLinePathRenderer.h
+++ b/src/gpu/GrAAHairLinePathRenderer.h
@@ -40,7 +40,8 @@
GrDrawTarget* target,
GrDrawState::StageMask stageMask,
int* lineCnt,
- int* quadCnt);
+ int* quadCnt,
+ GrDrawTarget::AutoReleaseGeometry* arg);
const GrIndexBuffer* fLinesIndexBuffer;
const GrIndexBuffer* fQuadsIndexBuffer;
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 72b3c60..7130bb5 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -189,7 +189,8 @@
GrDrawState::StageMask stageMask,
GrPrimitiveType* primType,
int* vertexCnt,
- int* indexCnt) {
+ int* indexCnt,
+ GrDrawTarget::AutoReleaseGeometry* arg) {
{
SK_TRACE_EVENT0("GrDefaultPathRenderer::createGeom");
@@ -232,25 +233,19 @@
}
}
- GrPoint* base;
- if (!target->reserveVertexSpace(layout, maxPts, (void**)&base)) {
+
+ if (!arg->set(target, layout, maxPts, maxIdxs)) {
return false;
}
+
+ uint16_t* idxBase = reinterpret_cast<uint16_t*>(arg->indices());;
+ uint16_t* idx = idxBase;
+ uint16_t subpathIdxStart = 0;
+
+ GrPoint* base = reinterpret_cast<GrPoint*>(arg->vertices());
GrAssert(NULL != base);
GrPoint* vert = base;
- uint16_t* idxBase = NULL;
- uint16_t* idx = NULL;
- uint16_t subpathIdxStart = 0;
- if (indexed) {
- if (!target->reserveIndexSpace(maxIdxs, (void**)&idxBase)) {
- target->resetVertexSource();
- return false;
- }
- GrAssert(NULL != idxBase);
- idx = idxBase;
- }
-
GrPoint pts[4];
bool first = true;
@@ -350,6 +345,7 @@
int vertexCnt;
int indexCnt;
GrPrimitiveType primType;
+ GrDrawTarget::AutoReleaseGeometry arg;
if (!this->createGeom(path,
fill,
translate,
@@ -358,7 +354,8 @@
stageMask,
&primType,
&vertexCnt,
- &indexCnt)) {
+ &indexCnt,
+ &arg)) {
return false;
}
diff --git a/src/gpu/GrDefaultPathRenderer.h b/src/gpu/GrDefaultPathRenderer.h
index a6a4cda..d5b9738 100644
--- a/src/gpu/GrDefaultPathRenderer.h
+++ b/src/gpu/GrDefaultPathRenderer.h
@@ -58,7 +58,8 @@
GrDrawState::StageMask stages,
GrPrimitiveType* primType,
int* vertexCnt,
- int* indexCnt);
+ int* indexCnt,
+ GrDrawTarget::AutoReleaseGeometry* arg);
bool fSeparateStencil;
bool fStencilWrapOps;