src/gpu/effects/GrDashingEffect.cpp - Issue 820783005: More changes to bring together path / geo procs

Unified Diff: src/gpu/effects/GrDashingEffect.cpp

Issue 820783005: More changes to bring together path / geo procs (Closed) Base URL: https://skia.googlesource.com/skia.git@lc1

Patch Set: dm fix Created 5 years, 11 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

Index: src/gpu/effects/GrDashingEffect.cpp

diff --git a/src/gpu/effects/GrDashingEffect.cpp b/src/gpu/effects/GrDashingEffect.cpp

index 2543145c2088677c5da04ef4640d64b87e6ed2fa..7016ef203e204f11ef24abc0ec34b04c00fa01ee 100644

--- a/src/gpu/effects/GrDashingEffect.cpp

+++ b/src/gpu/effects/GrDashingEffect.cpp

@@ -480,9 +480,9 @@ public:

const char* name() const SK_OVERRIDE { return "DashingCircleEffect"; }

- const GrAttribute* inPosition() const { return fInPosition; }

+ const Attribute* inPosition() const { return fInPosition; }

- const GrAttribute* inCoord() const { return fInCoord; }

+ const Attribute* inCoord() const { return fInCoord; }

GrPrimitiveEdgeType getEdgeType() const { return fEdgeType; }

@@ -514,8 +514,8 @@ private:

void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE;

GrPrimitiveEdgeType fEdgeType;

- const GrAttribute* fInPosition;

- const GrAttribute* fInCoord;

+ const Attribute* fInPosition;

+ const Attribute* fInCoord;

SkScalar fIntervalLength;

SkScalar fRadius;

SkScalar fCenterX;

@@ -685,8 +685,8 @@ DashingCircleEffect::DashingCircleEffect(GrColor color,

const SkMatrix& localMatrix)

: INHERITED(color, SkMatrix::I(), localMatrix), fEdgeType(edgeType) {

this->initClassID<DashingCircleEffect>();

- fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));

- fInCoord = &this->addVertexAttrib(GrAttribute("inCoord", kVec2f_GrVertexAttribType));

+ fInPosition = &this->addVertexAttrib(Attribute("inPosition", kVec2f_GrVertexAttribType));

+ fInCoord = &this->addVertexAttrib(Attribute("inCoord", kVec2f_GrVertexAttribType));

SkScalar onLen = info.fIntervals[0];

SkScalar offLen = info.fIntervals[1];

fIntervalLength = onLen + offLen;

@@ -774,9 +774,9 @@ public:

const char* name() const SK_OVERRIDE { return "DashingEffect"; }