gm/beziereffects.cpp - Issue 1122673002: Start on simplifying generateGeometry() overrides

Unified Diff: gm/beziereffects.cpp

Issue 1122673002: Start on simplifying generateGeometry() overrides (Closed) Base URL: https://skia.googlesource.com/skia.git@ibcache

Patch Set: whitespace, remove debug return Created 5 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: gm/beziereffects.cpp

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp

index 656842289867710a072b6ae1456d409d0cbd9a93..d543c149c715a0c53274c89f2a2aa53a9ef2406f 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 @@ private:

}

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 @@ private:

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 @@ private:

}