src/gpu/effects/GrDashingEffect.cpp - Issue 543623004: Removing vertex attrib indices

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

Issue 543623004: Removing vertex attrib indices (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: test Created 6 years, 3 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

« src/gpu/effects/GrBezierEffect.cpp ('K') | « src/gpu/effects/GrCustomCoordsTextureEffect.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.h » ('j') | src/gpu/effects/GrGeometryProcessor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/effects/GrDashingEffect.cpp

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

index f4298eb4a0c6c7934488af89d99e05d7a838e472..57c0017a0f41cf043e6b144f0945ddae90ed53eb 100644

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

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

@@ -10,9 +10,9 @@

#include "../GrAARectRenderer.h"

-#include "effects/GrVertexEffect.h"

+#include "effects/GrGeometryProcessor.h"

#include "gl/GrGLEffect.h"

-#include "gl/GrGLVertexEffect.h"

+#include "gl/GrGLGeometryProcessor.h"

#include "gl/GrGLSL.h"

#include "GrContext.h"

#include "GrCoordTransform.h"

@@ -69,6 +69,10 @@ struct DashLineVertex {

SkPoint fDashPos;

};

+extern const GrVertexAttrib gDashLineNoAAVertexAttribs[] = {

+ { kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding }

+};

extern const GrVertexAttrib gDashLineVertexAttribs[] = {

{ kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding },

{ kVec2f_GrVertexAttribType, sizeof(SkPoint), kEffect_GrVertexAttribBinding },

@@ -346,12 +350,16 @@ bool GrDashingEffect::DrawDashLine(const SkPoint pts[2], const GrPaint& paint,

GrDashingEffect::DashCap capType = isRoundCap ? GrDashingEffect::kRound_DashCap :

GrDashingEffect::kNonRound_DashCap;

drawState->setGeometryProcessor(

- GrDashingEffect::Create(edgeType, devInfo, strokeWidth, capType), 1)->unref();

- }

+ GrDashingEffect::Create(edgeType, devInfo, strokeWidth, capType))->unref();

- // Set up the vertex data for the line and start/end dashes

- drawState->setVertexAttribs<gDashLineVertexAttribs>(SK_ARRAY_COUNT(gDashLineVertexAttribs),

- sizeof(DashLineVertex));

+ // Set up the vertex data for the line and start/end dashes

+ drawState->setVertexAttribs<gDashLineVertexAttribs>(SK_ARRAY_COUNT(gDashLineVertexAttribs),

+ sizeof(DashLineVertex));

+ } else {

+ // Set up the vertex data for the line and start/end dashes

+ drawState->setVertexAttribs<gDashLineNoAAVertexAttribs>(

+ SK_ARRAY_COUNT(gDashLineNoAAVertexAttribs), sizeof(DashLineVertex));

+ }

int totalRectCnt = 0;

@@ -424,7 +432,7 @@ class GLDashingCircleEffect;

* transform the line to be horizontal, with the start of line at the origin then shifted to the

* right by half the off interval. The line then goes in the positive x direction.

-class DashingCircleEffect : public GrVertexEffect {

+class DashingCircleEffect : public GrGeometryProcessor {

public:

typedef SkPathEffect::DashInfo DashInfo;

@@ -434,6 +442,8 @@ public:

static const char* Name() { return "DashingCircleEffect"; }

+ const GrShaderVar& aCoord() const { return fAttrCoord; }

GrEffectEdgeType getEdgeType() const { return fEdgeType; }

SkScalar getRadius() const { return fRadius; }

@@ -454,18 +464,19 @@ private:

virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;

GrEffectEdgeType fEdgeType;

+ const GrShaderVar& fAttrCoord;

SkScalar fIntervalLength;

SkScalar fRadius;

SkScalar fCenterX;

GR_DECLARE_EFFECT_TEST;

- typedef GrVertexEffect INHERITED;

+ typedef GrGeometryProcessor INHERITED;

};

//////////////////////////////////////////////////////////////////////////////

-class GLDashingCircleEffect : public GrGLVertexEffect {

+class GLDashingCircleEffect : public GrGLGeometryProcessor {

public:

GLDashingCircleEffect(const GrBackendEffectFactory&, const GrDrawEffect&);

@@ -486,7 +497,7 @@ private:

SkScalar fPrevRadius;

SkScalar fPrevCenterX;

SkScalar fPrevIntervalLength;

- typedef GrGLVertexEffect INHERITED;

+ typedef GrGLGeometryProcessor INHERITED;

};

GLDashingCircleEffect::GLDashingCircleEffect(const GrBackendEffectFactory& factory,

@@ -517,9 +528,7 @@ void GLDashingCircleEffect::emitCode(GrGLFullProgramBuilder* builder,

builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName);

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();

- const SkString* attr0Name =

- vsBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

- vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, attr0Name->c_str());

+ vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dce.aCoord().c_str());

// transforms all points so that we can compare them to our test circle

GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

@@ -582,14 +591,15 @@ const GrBackendEffectFactory& DashingCircleEffect::getFactory() const {

DashingCircleEffect::DashingCircleEffect(GrEffectEdgeType edgeType, const DashInfo& info,

SkScalar radius)

- : fEdgeType(edgeType) {

+ : fEdgeType(edgeType)

+ , fAttrCoord(this->addVertexAttrib(GrShaderVar("aCoord",

+ kVec2f_GrSLType,

+ GrShaderVar::kAttribute_TypeModifier))) {

SkScalar onLen = info.fIntervals[0];

SkScalar offLen = info.fIntervals[1];

fIntervalLength = onLen + offLen;

fRadius = radius;

fCenterX = SkScalarHalf(offLen);

- this->addVertexAttrib(kVec2f_GrSLType);

}

bool DashingCircleEffect::onIsEqual(const GrEffect& other) const {

@@ -635,7 +645,7 @@ class GLDashingLineEffect;

* line at the origin then shifted to the right by half the off interval. The line then goes in the

* positive x direction.

-class DashingLineEffect : public GrVertexEffect {

+class DashingLineEffect : public GrGeometryProcessor {

public:

typedef SkPathEffect::DashInfo DashInfo;

@@ -645,6 +655,8 @@ public:

static const char* Name() { return "DashingEffect"; }

+ const GrShaderVar& aCoord() const { return fAttrCoord; }

GrEffectEdgeType getEdgeType() const { return fEdgeType; }

const SkRect& getRect() const { return fRect; }

@@ -663,17 +675,18 @@ private:

virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;

GrEffectEdgeType fEdgeType;

+ const GrShaderVar& fAttrCoord;

SkRect fRect;

SkScalar fIntervalLength;

GR_DECLARE_EFFECT_TEST;

- typedef GrVertexEffect INHERITED;

+ typedef GrGeometryProcessor INHERITED;

};

//////////////////////////////////////////////////////////////////////////////

-class GLDashingLineEffect : public GrGLVertexEffect {

+class GLDashingLineEffect : public GrGLGeometryProcessor {

public:

GLDashingLineEffect(const GrBackendEffectFactory&, const GrDrawEffect&);

@@ -694,7 +707,7 @@ private:

GrGLProgramDataManager::UniformHandle fIntervalUniform;

SkRect fPrevRect;

SkScalar fPrevIntervalLength;

- typedef GrGLVertexEffect INHERITED;

+ typedef GrGLGeometryProcessor INHERITED;

};

GLDashingLineEffect::GLDashingLineEffect(const GrBackendEffectFactory& factory,

@@ -729,9 +742,7 @@ void GLDashingLineEffect::emitCode(GrGLFullProgramBuilder* builder,

const char *vsCoordName, *fsCoordName;

builder->addVarying(kVec2f_GrSLType, "Coord", &vsCoordName, &fsCoordName);

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();

- const SkString* attr0Name =

- vsBuilder->getEffectAttributeName(drawEffect.getVertexAttribIndices()[0]);

- vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, attr0Name->c_str());

+ vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, de.aCoord().c_str());

// transforms all points so that we can compare them to our test rect

GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

@@ -801,15 +812,16 @@ const GrBackendEffectFactory& DashingLineEffect::getFactory() const {

DashingLineEffect::DashingLineEffect(GrEffectEdgeType edgeType, const DashInfo& info,

SkScalar strokeWidth)

- : fEdgeType(edgeType) {

+ : fEdgeType(edgeType)

+ , fAttrCoord(this->addVertexAttrib(GrShaderVar("aCoord",

+ kVec2f_GrSLType,

+ GrShaderVar::kAttribute_TypeModifier))) {

SkScalar onLen = info.fIntervals[0];

SkScalar offLen = info.fIntervals[1];

SkScalar halfOffLen = SkScalarHalf(offLen);

SkScalar halfStroke = SkScalarHalf(strokeWidth);

fIntervalLength = onLen + offLen;

fRect.set(halfOffLen, -halfStroke, halfOffLen + onLen, halfStroke);

- this->addVertexAttrib(kVec2f_GrSLType);

}

bool DashingLineEffect::onIsEqual(const GrEffect& other) const {