src/gpu/effects/GrBezierEffect.cpp - Issue 25474006: Move VertexBuilder to a GrGLFullShaderBuilder subclass

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

Issue 25474006: Move VertexBuilder to a GrGLFullShaderBuilder subclass (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 2 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/GrBezierEffect.cpp

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

index 9adf59261bac80494acf0df004d507180ab70f50..1a6b80b3ed1050aa2cee6a7930ce8688f3a40dd5 100644

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

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

@@ -11,11 +11,11 @@

#include "gl/GrGLSL.h"

#include "GrTBackendEffectFactory.h"

-class GrGLConicEffect : public GrGLEffect {

+class GrGLConicEffect : public GrGLVertexEffect {

public:

GrGLConicEffect(const GrBackendEffectFactory&, const GrDrawEffect&);

- virtual void emitCode(GrGLShaderBuilder* builder,

+ virtual void emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

@@ -30,7 +30,7 @@ public:

private:

GrBezierEdgeType fEdgeType;

- typedef GrGLEffect INHERITED;

+ typedef GrGLVertexEffect INHERITED;

};

GrGLConicEffect::GrGLConicEffect(const GrBackendEffectFactory& factory,

@@ -40,23 +40,20 @@ GrGLConicEffect::GrGLConicEffect(const GrBackendEffectFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLConicEffect::emitCode(GrGLShaderBuilder* builder,

+void GrGLConicEffect::emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) {

- GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder();

- SkASSERT(NULL != vertexBuilder);

const char *vsName, *fsName;

- vertexBuilder->addVarying(kVec4f_GrSLType, "ConicCoeffs",

+ builder->addVarying(kVec4f_GrSLType, "ConicCoeffs",

&vsName, &fsName);

const SkString* attr0Name =

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

- vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());

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

+ builder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());

builder->fsCodeAppend("\t\tfloat edgeAlpha;\n");

@@ -156,11 +153,11 @@ GrEffectRef* GrConicEffect::TestCreate(SkRandom* random,

// Quad

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

-class GrGLQuadEffect : public GrGLEffect {

+class GrGLQuadEffect : public GrGLVertexEffect {

public:

GrGLQuadEffect(const GrBackendEffectFactory&, const GrDrawEffect&);

- virtual void emitCode(GrGLShaderBuilder* builder,

+ virtual void emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

@@ -175,7 +172,7 @@ public:

private:

GrBezierEdgeType fEdgeType;

- typedef GrGLEffect INHERITED;

+ typedef GrGLVertexEffect INHERITED;

};

GrGLQuadEffect::GrGLQuadEffect(const GrBackendEffectFactory& factory,

@@ -185,23 +182,20 @@ GrGLQuadEffect::GrGLQuadEffect(const GrBackendEffectFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLQuadEffect::emitCode(GrGLShaderBuilder* builder,

+void GrGLQuadEffect::emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) {

- GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder();

- SkASSERT(NULL != vertexBuilder);

const char *vsName, *fsName;

const SkString* attrName =

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

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

builder->fsCodeAppendf("\t\tfloat edgeAlpha;\n");

- vertexBuilder->addVarying(kVec4f_GrSLType, "HairQuadEdge", &vsName, &fsName);

+ builder->addVarying(kVec4f_GrSLType, "HairQuadEdge", &vsName, &fsName);

switch (fEdgeType) {

case kHairAA_GrBezierEdgeType: {

@@ -248,7 +242,7 @@ void GrGLQuadEffect::emitCode(GrGLShaderBuilder* builder,

GrGLSLModulatef<4>(&modulate, inputColor, "edgeAlpha");

builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str());

- vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());

+ builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());

}

GrGLEffect::EffectKey GrGLQuadEffect::GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) {

@@ -290,11 +284,11 @@ GrEffectRef* GrQuadEffect::TestCreate(SkRandom* random,

// Cubic

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

-class GrGLCubicEffect : public GrGLEffect {

+class GrGLCubicEffect : public GrGLVertexEffect {

public:

GrGLCubicEffect(const GrBackendEffectFactory&, const GrDrawEffect&);

- virtual void emitCode(GrGLShaderBuilder* builder,

+ virtual void emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

@@ -309,7 +303,7 @@ public:

private:

GrBezierEdgeType fEdgeType;

- typedef GrGLEffect INHERITED;

+ typedef GrGLVertexEffect INHERITED;

};

GrGLCubicEffect::GrGLCubicEffect(const GrBackendEffectFactory& factory,

@@ -319,23 +313,20 @@ GrGLCubicEffect::GrGLCubicEffect(const GrBackendEffectFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLCubicEffect::emitCode(GrGLShaderBuilder* builder,

+void GrGLCubicEffect::emitCode(GrGLFullShaderBuilder* builder,

const GrDrawEffect& drawEffect,

EffectKey key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray& samplers) {

- GrGLShaderBuilder::VertexBuilder* vertexBuilder = builder->getVertexBuilder();

- SkASSERT(NULL != vertexBuilder);

const char *vsName, *fsName;

- vertexBuilder->addVarying(kVec4f_GrSLType, "CubicCoeffs",

+ builder->addVarying(kVec4f_GrSLType, "CubicCoeffs",

&vsName, &fsName);

const SkString* attr0Name =

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

- vertexBuilder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());

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

+ builder->vsCodeAppendf("\t%s = %s;\n", vsName, attr0Name->c_str());

builder->fsCodeAppend("\t\tfloat edgeAlpha;\n");

« src/gpu/GrAARectRenderer.cpp ('K') | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/effects/GrCustomCoordsTextureEffect.cpp » ('j') | src/gpu/gl/GrGLEffect.h » ('J')