diff options
Diffstat (limited to 'src/gpu/ops/GrRegionOp.cpp')
| -rw-r--r-- | src/gpu/ops/GrRegionOp.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp index 9a9814e0be..9e81d66730 100644 --- a/src/gpu/ops/GrRegionOp.cpp +++ b/src/gpu/ops/GrRegionOp.cpp @@ -115,8 +115,7 @@ private: SkDebugf("Couldn't create GrGeometryProcessor\n"); return; } - static constexpr size_t kVertexStride = sizeof(GrDefaultGeoProcFactory::PositionColorAttr); - SkASSERT(kVertexStride == gp->debugOnly_vertexStride()); + SkASSERT(gp->getVertexStride() == sizeof(GrDefaultGeoProcFactory::PositionColorAttr)); int numRegions = fRegions.count(); int numRects = 0; @@ -127,10 +126,12 @@ private: if (!numRects) { return; } + size_t vertexStride = gp->getVertexStride(); sk_sp<const GrBuffer> indexBuffer = target->resourceProvider()->refQuadIndexBuffer(); PatternHelper helper(GrPrimitiveType::kTriangles); - void* vertices = helper.init(target, kVertexStride, indexBuffer.get(), kVertsPerInstance, - kIndicesPerInstance, numRects); + void* vertices = + helper.init(target, vertexStride, indexBuffer.get(), kVertsPerInstance, + kIndicesPerInstance, numRects); if (!vertices || !indexBuffer) { SkDebugf("Could not allocate vertices\n"); return; @@ -138,9 +139,9 @@ private: intptr_t verts = reinterpret_cast<intptr_t>(vertices); for (int i = 0; i < numRegions; i++) { - tesselate_region(verts, kVertexStride, fRegions[i].fColor, fRegions[i].fRegion); + tesselate_region(verts, vertexStride, fRegions[i].fColor, fRegions[i].fRegion); int numRectsInRegion = fRegions[i].fRegion.computeRegionComplexity(); - verts += numRectsInRegion * kVertsPerInstance * kVertexStride; + verts += numRectsInRegion * kVertsPerInstance * vertexStride; } helper.recordDraw(target, gp.get(), fHelper.makePipeline(target)); } |