diff options
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 17 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 5 |
2 files changed, 9 insertions, 13 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index dea6150549..7f7bf8ffb7 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -91,14 +91,13 @@ private: void onPrepareDraws(Target* target) override { QuadHelper helper; - size_t vertexStride = this->gp()->getVertexStride(); - SkASSERT(vertexStride == sizeof(SkPoint)); - SkPoint* pts = reinterpret_cast<SkPoint*>(helper.init(target, vertexStride, 1)); + SkASSERT(this->gp()->debugOnly_vertexStride() == sizeof(SkPoint)); + SkPoint* pts = reinterpret_cast<SkPoint*>(helper.init(target, sizeof(SkPoint), 1)); if (!pts) { return; } SkRect rect = this->rect(); - SkPointPriv::SetRectTriStrip(pts, rect, vertexStride); + SkPointPriv::SetRectTriStrip(pts, rect, sizeof(SkPoint)); helper.recordDraw(target, this->gp(), this->makePipeline(target)); } @@ -282,9 +281,8 @@ private: void onPrepareDraws(Target* target) override { QuadHelper helper; - size_t vertexStride = this->gp()->getVertexStride(); - SkASSERT(vertexStride == sizeof(Vertex)); - Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, vertexStride, 1)); + SkASSERT(this->gp()->debugOnly_vertexStride() == sizeof(Vertex)); + Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, sizeof(Vertex), 1)); if (!verts) { return; } @@ -502,9 +500,8 @@ private: void onPrepareDraws(Target* target) override { QuadHelper helper; - size_t vertexStride = this->gp()->getVertexStride(); - SkASSERT(vertexStride == sizeof(Vertex)); - Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, vertexStride, 1)); + SkASSERT(this->gp()->debugOnly_vertexStride() == sizeof(Vertex)); + Vertex* verts = reinterpret_cast<Vertex*>(helper.init(target, sizeof(Vertex), 1)); if (!verts) { return; } diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 8f8d1b4d50..da3d0657ae 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -81,10 +81,9 @@ private: sk_sp<GrGeometryProcessor> gp(GrDefaultGeoProcFactory::Make( color, Coverage::kSolid_Type, LocalCoords::kUnused_Type, SkMatrix::I())); - size_t vertexStride = gp->getVertexStride(); - SkASSERT(vertexStride == sizeof(SkPoint)); + SkASSERT(gp->debugOnly_vertexStride() == sizeof(SkPoint)); QuadHelper helper; - SkPoint* verts = reinterpret_cast<SkPoint*>(helper.init(target, vertexStride, 1)); + SkPoint* verts = reinterpret_cast<SkPoint*>(helper.init(target, sizeof(SkPoint), 1)); if (!verts) { return; } |