diff options
| author | bsalomon <bsalomon@google.com> | 2015-08-17 12:55:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-17 12:55:38 -0700 |
| commit | 7539856c1b9cbb1886a6a498cc534b77fc83ddb2 (patch) | |
| tree | d56158986f7db1a81d2a7b9a791332665094befc /gm | |
| parent | 1a899c9d547e5f12505e5bf654e4fb8b7dda0669 (diff) | |
| download | skia-7539856c1b9cbb1886a6a498cc534b77fc83ddb2.tar.gz | |
Make GrVertexBatch objects hold their own draws during GrDrawTarget flush
NO_MERGE_BUILDS
Review URL: https://codereview.chromium.org/1286043004
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 14 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index a53ac0e96a..2636f26001 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -12,7 +12,7 @@ #if SK_SUPPORT_GPU -#include "GrBatchTarget.h" +#include "GrBatchFlushState.h" #include "GrContext.h" #include "GrPathUtils.h" #include "GrTest.h" @@ -71,11 +71,11 @@ private: return &fGeometry; } - void onGenerateGeometry(GrBatchTarget* batchTarget) override { + void generateGeometry(Target* target) override { QuadHelper helper; size_t vertexStride = this->geometryProcessor()->getVertexStride(); SkASSERT(vertexStride == sizeof(Vertex)); - Vertex* verts = reinterpret_cast<Vertex*>(helper.init(batchTarget, vertexStride, 1)); + Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, vertexStride, 1)); if (!verts) { return; } @@ -88,7 +88,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); } - helper.issueDraw(batchTarget); + helper.recordDraw(target); } Geometry fGeometry; @@ -467,11 +467,11 @@ private: return &fGeometry; } - void onGenerateGeometry(GrBatchTarget* batchTarget) override { + void generateGeometry(Target* target) override { QuadHelper helper; size_t vertexStride = this->geometryProcessor()->getVertexStride(); SkASSERT(vertexStride == sizeof(Vertex)); - Vertex* verts = reinterpret_cast<Vertex*>(helper.init(batchTarget, vertexStride, 1)); + Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, vertexStride, 1)); if (!verts) { return; } @@ -479,7 +479,7 @@ private: fGeometry.fBounds.fRight, fGeometry.fBounds.fBottom, sizeof(Vertex)); fDevToUV.apply<4, sizeof(Vertex), sizeof(SkPoint)>(verts); - helper.issueDraw(batchTarget); + helper.recordDraw(target); } Geometry fGeometry; diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index e9b417fc38..30471a797d 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -12,7 +12,7 @@ #if SK_SUPPORT_GPU -#include "GrBatchTarget.h" +#include "GrBatchFlushState.h" #include "GrContext.h" #include "GrDefaultGeoProcFactory.h" #include "GrPathUtils.h" @@ -58,11 +58,11 @@ private: return &fGeometry; } - void onGenerateGeometry(GrBatchTarget* batchTarget) override { + void generateGeometry(Target* target) override { size_t vertexStride = this->geometryProcessor()->getVertexStride(); SkASSERT(vertexStride == sizeof(SkPoint)); QuadHelper helper; - SkPoint* verts = reinterpret_cast<SkPoint*>(helper.init(batchTarget, vertexStride, 1)); + SkPoint* verts = reinterpret_cast<SkPoint*>(helper.init(target, vertexStride, 1)); if (!verts) { return; } @@ -72,7 +72,7 @@ private: fGeometry.fBounds.outset(5.f, 5.f); fGeometry.fBounds.toQuad(verts); - helper.issueDraw(batchTarget); + helper.recordDraw(target); } Geometry fGeometry; |