Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gm/beziereffects.cpp

Issue 913153003: Revert of GMs now use batch (Closed) Base URL: https://skia.googlesource.com/skia.git@oval
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | gm/convexpolyeffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/beziereffects.cpp
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 578a597ce51ce4f6808ea658e760d4aba456545a..0ddcc52b95da2de9c37acb51ec594885fb2a37ad 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -12,12 +12,9 @@
#if SK_SUPPORT_GPU
-#include "GrBatchTarget.h"
-#include "GrBufferAllocPool.h"
#include "GrContext.h"
#include "GrPathUtils.h"
#include "GrTest.h"
-#include "GrTestBatch.h"
#include "SkColorPriv.h"
#include "SkDevice.h"
#include "SkGeometry.h"
@@ -29,86 +26,6 @@
}
namespace skiagm {
-
-class BezierCubicOrConicTestBatch : public GrTestBatch {
-public:
- struct Geometry : public GrTestBatch::Geometry {
- SkRect fBounds;
- };
-
- const char* name() const SK_OVERRIDE { return "BezierCubicOrConicTestBatch"; }
-
- static GrBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
- const SkScalar klmEqs[9], SkScalar sign) {
- return SkNEW_ARGS(BezierCubicOrConicTestBatch, (gp, geo, klmEqs, sign));
- }
-
-private:
- BezierCubicOrConicTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
- const SkScalar klmEqs[9], SkScalar sign)
- : INHERITED(gp) {
- for (int i = 0; i < 9; i++) {
- fKlmEqs[i] = klmEqs[i];
- }
-
- fGeometry = geo;
- fSign = sign;
- }
-
- struct Vertex {
- SkPoint fPosition;
- float fKLM[4]; // The last value is ignored. The effect expects a vec4f.
- };
-
- Geometry* geoData(int index) SK_OVERRIDE {
- SkASSERT(0 == index);
- return &fGeometry;
- }
-
- void onGenerateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) SK_OVERRIDE {
- size_t vertexStride = this->geometryProcessor()->getVertexStride();
-
- const GrVertexBuffer* vertexBuffer;
- int firstVertex;
-
- void* vertices = batchTarget->vertexPool()->makeSpace(vertexStride,
- kVertsPerCubic,
- &vertexBuffer,
- &firstVertex);
-
- 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));
- for (int v = 0; v < 4; ++v) {
- verts[v].fKLM[0] = eval_line(verts[v].fPosition, fKlmEqs + 0, fSign);
- 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(batchTarget->quadIndexBuffer());
- batchTarget->draw(drawInfo);
- }
-
- Geometry fGeometry;
- SkScalar fKlmEqs[9];
- SkScalar fSign;
-
- static const int kVertsPerCubic = 4;
- static const int kIndicesPerCubic = 6;
-
- typedef GrTestBatch INHERITED;
-};
-
/**
* This GM directly exercises effects that draw Bezier curves in the GPU backend.
*/
@@ -126,6 +43,7 @@
SkISize onISize() SK_OVERRIDE {
return SkISize::Make(800, 800);
}
+
void onDraw(SkCanvas* canvas) SK_OVERRIDE {
GrRenderTarget* rt = canvas->internal_private_accessTopLayerRenderTarget();
@@ -229,16 +147,25 @@
SkASSERT(tt.target());
GrPipelineBuilder pipelineBuilder;
+
+ GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
+ SkASSERT(gp->getVertexStride() == sizeof(Vertex));
+ Vertex* verts = reinterpret_cast<Vertex*>(geo.vertices());
+
+ verts[0].fPosition.setRectFan(bounds.fLeft, bounds.fTop,
+ bounds.fRight, bounds.fBottom,
+ sizeof(Vertex));
+ for (int v = 0; v < 4; ++v) {
+ verts[v].fKLM[0] = eval_line(verts[v].fPosition, klmEqs + 0, klmSigns[c]);
+ verts[v].fKLM[1] = eval_line(verts[v].fPosition, klmEqs + 3, klmSigns[c]);
+ verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
+ }
+
pipelineBuilder.setRenderTarget(rt);
- BezierCubicOrConicTestBatch::Geometry geometry;
- geometry.fColor = gp->color();
- geometry.fBounds = bounds;
-
- SkAutoTUnref<GrBatch> batch(BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs,
- klmSigns[c]));
-
- tt.target()->drawBatch(&pipelineBuilder, batch, NULL);
+ tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0,4,6);
}
++col;
if (numCols == col) {
@@ -373,16 +300,25 @@
SkASSERT(tt.target());
GrPipelineBuilder pipelineBuilder;
+
+ GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
+ SkASSERT(gp->getVertexStride() == sizeof(Vertex));
+ Vertex* verts = reinterpret_cast<Vertex*>(geo.vertices());
+
+ verts[0].fPosition.setRectFan(bounds.fLeft, bounds.fTop,
+ bounds.fRight, bounds.fBottom,
+ sizeof(Vertex));
+ for (int v = 0; v < 4; ++v) {
+ verts[v].fKLM[0] = eval_line(verts[v].fPosition, klmEqs + 0, 1.f);
+ verts[v].fKLM[1] = eval_line(verts[v].fPosition, klmEqs + 3, 1.f);
+ verts[v].fKLM[2] = eval_line(verts[v].fPosition, klmEqs + 6, 1.f);
+ }
+
pipelineBuilder.setRenderTarget(rt);
- BezierCubicOrConicTestBatch::Geometry geometry;
- geometry.fColor = gp->color();
- geometry.fBounds = bounds;
-
- SkAutoTUnref<GrBatch> batch(BezierCubicOrConicTestBatch::Create(gp, geometry, klmEqs,
- 1.f));
-
- tt.target()->drawBatch(&pipelineBuilder, batch, NULL);
+ tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangleFan_GrPrimitiveType,
+ 0, 0,4,6);
}
++col;
if (numCols == col) {
@@ -435,79 +371,6 @@
};
//////////////////////////////////////////////////////////////////////////////
-
-class BezierQuadTestBatch : public GrTestBatch {
-public:
- struct Geometry : public GrTestBatch::Geometry {
- SkRect fBounds;
- };
-
- const char* name() const SK_OVERRIDE { return "BezierQuadTestBatch"; }
-
- static GrBatch* Create(const GrGeometryProcessor* gp, const Geometry& geo,
- const GrPathUtils::QuadUVMatrix& devToUV) {
- return SkNEW_ARGS(BezierQuadTestBatch, (gp, geo, devToUV));
- }
-
-private:
- BezierQuadTestBatch(const GrGeometryProcessor* gp, const Geometry& geo,
- const GrPathUtils::QuadUVMatrix& devToUV)
- : INHERITED(gp)
- , fGeometry(geo)
- , fDevToUV(devToUV) {
- }
-
- struct Vertex {
- SkPoint fPosition;
- float fKLM[4]; // The last value is ignored. The effect expects a vec4f.
- };
-
- Geometry* geoData(int index) SK_OVERRIDE {
- SkASSERT(0 == index);
- return &fGeometry;
- }
-
- void onGenerateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) SK_OVERRIDE {
- size_t vertexStride = this->geometryProcessor()->getVertexStride();
-
- const GrVertexBuffer* vertexBuffer;
- int firstVertex;
-
- void* vertices = batchTarget->vertexPool()->makeSpace(vertexStride,
- kVertsPerCubic,
- &vertexBuffer,
- &firstVertex);
-
- 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(batchTarget->quadIndexBuffer());
- batchTarget->draw(drawInfo);
- }
-
- Geometry fGeometry;
- GrPathUtils::QuadUVMatrix fDevToUV;
-
- static const int kVertsPerCubic = 4;
- static const int kIndicesPerCubic = 6;
-
- typedef GrTestBatch INHERITED;
-};
-
/**
* This GM directly exercises effects that draw Bezier quad curves in the GPU backend.
*/
@@ -621,17 +484,23 @@
SkASSERT(tt.target());
GrPipelineBuilder pipelineBuilder;
+
+ GrDrawTarget::AutoReleaseGeometry geo(tt.target(), 4, gp->getVertexStride(), 0);
+ SkASSERT(gp->getVertexStride() == sizeof(Vertex));
+ Vertex* verts = reinterpret_cast<Vertex*>(geo.vertices());
+
+ verts[0].fPosition.setRectFan(bounds.fLeft, bounds.fTop,
+ bounds.fRight, bounds.fBottom,
+ sizeof(Vertex));
+
+ GrPathUtils::QuadUVMatrix DevToUV(pts);
+ DevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts);
+
pipelineBuilder.setRenderTarget(rt);
- GrPathUtils::QuadUVMatrix DevToUV(pts);
-
- BezierQuadTestBatch::Geometry geometry;
- geometry.fColor = gp->color();
- geometry.fBounds = bounds;
-
- SkAutoTUnref<GrBatch> batch(BezierQuadTestBatch::Create(gp, geometry, DevToUV));
-
- tt.target()->drawBatch(&pipelineBuilder, batch, NULL);
+ tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
+ tt.target()->drawIndexed(&pipelineBuilder, gp, kTriangles_GrPrimitiveType,
+ 0, 0, 4, 6);
}
++col;
if (numCols == col) {
« no previous file with comments | « no previous file | gm/convexpolyeffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698