From 19c1233c447f625c2522e7ecd0a0adecc629bb2f Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 18 Jun 2018 12:52:47 -0400 Subject: Change how vertex/instance attributes are handled in geometry processors. * No longer register vertex/instance attributes on base class, just counts * Separate instance and vertex attributes and remove InputRate and offset * Make attributes constexpr where possible Change-Id: I1f1d5e772fa177a96d2aeb805aab7b69f35bfae6 Reviewed-on: https://skia-review.googlesource.com/132405 Commit-Queue: Brian Salomon Reviewed-by: Chris Dalton --- src/gpu/ops/GrAAFillRectOp.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/gpu/ops/GrAAFillRectOp.cpp') diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp index 5472f11f71..76bc8128cf 100644 --- a/src/gpu/ops/GrAAFillRectOp.cpp +++ b/src/gpu/ops/GrAAFillRectOp.cpp @@ -242,12 +242,19 @@ private: void onPrepareDraws(Target* target) override { using namespace GrDefaultGeoProcFactory; + size_t vertexStride = sizeof(SkPoint) + sizeof(GrColor); Color color(Color::kPremulGrColorAttribute_Type); - Coverage::Type coverageType = fHelper.compatibleWithAlphaAsCoverage() - ? Coverage::kSolid_Type - : Coverage::kAttribute_Type; - LocalCoords lc = fHelper.usesLocalCoords() ? LocalCoords::kHasExplicit_Type - : LocalCoords::kUnused_Type; + Coverage::Type coverageType = Coverage::kSolid_Type; + if (!fHelper.compatibleWithAlphaAsCoverage()) { + coverageType = Coverage::kAttribute_Type; + vertexStride += sizeof(float); + } + LocalCoords lc = LocalCoords::kUnused_Type; + if (fHelper.usesLocalCoords()) { + lc = LocalCoords::kHasExplicit_Type; + vertexStride += sizeof(SkPoint); + } + sk_sp gp = GrDefaultGeoProcFactory::Make(color, coverageType, lc, SkMatrix::I()); if (!gp) { @@ -255,7 +262,7 @@ private: return; } - size_t vertexStride = gp->getVertexStride(); + SkASSERT(vertexStride == gp->debugOnly_vertexStride()); sk_sp indexBuffer = get_index_buffer(target->resourceProvider()); PatternHelper helper(GrPrimitiveType::kTriangles); -- cgit v1.2.3