Start on simplifying generateGeometry() overrides
Committed: https://skia.googlesource.com/skia/+/f28381c6866cad92af8ebe5b9d2db074613b1963
Review URL: https://codereview.chromium.org/1122673002
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 6568422..d543c14 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -16,7 +16,6 @@
#include "GrBufferAllocPool.h"
#include "GrContext.h"
#include "GrPathUtils.h"
-#include "GrResourceProvider.h"
#include "GrTest.h"
#include "GrTestBatch.h"
#include "SkColorPriv.h"
@@ -67,25 +66,14 @@
}
void onGenerateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
- SkAutoTUnref<const GrIndexBuffer> indexBuffer(
- batchTarget->resourceProvider()->refQuadIndexBuffer());
-
+ QuadHelper helper;
size_t vertexStride = this->geometryProcessor()->getVertexStride();
- const GrVertexBuffer* vertexBuffer;
- int firstVertex;
- void* vertices = batchTarget->vertexPool()->makeSpace(vertexStride,
- kVertsPerCubic,
- &vertexBuffer,
- &firstVertex);
-
- if (!vertices || !indexBuffer) {
- SkDebugf("Could not allocate buffers\n");
+ SkASSERT(vertexStride == sizeof(Vertex));
+ Vertex* verts = reinterpret_cast<Vertex*>(helper.init(batchTarget, vertexStride, 1));
+ if (!verts) {
return;
}
- SkASSERT(vertexStride == sizeof(Vertex));
- Vertex* verts = reinterpret_cast<Vertex*>(vertices);
-
verts[0].fPosition.setRectFan(fGeometry.fBounds.fLeft, fGeometry.fBounds.fTop,
fGeometry.fBounds.fRight, fGeometry.fBounds.fBottom,
sizeof(Vertex));
@@ -94,16 +82,7 @@
verts[v].fKLM[1] = eval_line(verts[v].fPosition, fKlmEqs + 3, fSign);
verts[v].fKLM[2] = eval_line(verts[v].fPosition, fKlmEqs + 6, 1.f);
}
-
- GrDrawTarget::DrawInfo drawInfo;
- drawInfo.setPrimitiveType(kTriangleFan_GrPrimitiveType);
- drawInfo.setVertexBuffer(vertexBuffer);
- drawInfo.setStartVertex(firstVertex);
- drawInfo.setVertexCount(kVertsPerCubic);
- drawInfo.setStartIndex(0);
- drawInfo.setIndexCount(kIndicesPerCubic);
- drawInfo.setIndexBuffer(indexBuffer);
- batchTarget->draw(drawInfo);
+ helper.issueDraws(batchTarget);
}
Geometry fGeometry;
@@ -475,42 +454,19 @@
}
void onGenerateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
- SkAutoTUnref<const GrIndexBuffer> indexBuffer(
- batchTarget->resourceProvider()->refQuadIndexBuffer());
-
+ QuadHelper helper;
size_t vertexStride = this->geometryProcessor()->getVertexStride();
- const GrVertexBuffer* vertexBuffer;
- int firstVertex;
-
- void* vertices = batchTarget->vertexPool()->makeSpace(vertexStride,
- kVertsPerCubic,
- &vertexBuffer,
- &firstVertex);
-
- if (!vertices || !indexBuffer) {
- SkDebugf("Could not allocate buffers\n");
+ SkASSERT(vertexStride == sizeof(Vertex));
+ GrDrawTarget::DrawInfo drawInfo;
+ Vertex* verts = reinterpret_cast<Vertex*>(helper.init(batchTarget, vertexStride, 1));
+ if (!verts) {
return;
}
-
- SkASSERT(vertexStride == sizeof(Vertex));
- Vertex* verts = reinterpret_cast<Vertex*>(vertices);
-
verts[0].fPosition.setRectFan(fGeometry.fBounds.fLeft, fGeometry.fBounds.fTop,
fGeometry.fBounds.fRight, fGeometry.fBounds.fBottom,
sizeof(Vertex));
-
fDevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts);
-
-
- GrDrawTarget::DrawInfo drawInfo;
- drawInfo.setPrimitiveType(kTriangles_GrPrimitiveType);
- drawInfo.setVertexBuffer(vertexBuffer);
- drawInfo.setStartVertex(firstVertex);
- drawInfo.setVertexCount(kVertsPerCubic);
- drawInfo.setStartIndex(0);
- drawInfo.setIndexCount(kIndicesPerCubic);
- drawInfo.setIndexBuffer(indexBuffer);
- batchTarget->draw(drawInfo);
+ helper.issueDraws(batchTarget);
}
Geometry fGeometry;