src/gpu/GrAARectRenderer.cpp - Issue 571163002: removing GrDrawEffect

Unified Diff: src/gpu/GrAARectRenderer.cpp

Issue 571163002: removing GrDrawEffect (Closed) Base URL: https://skia.googlesource.com/skia.git@gp3

Patch Set: rebase after revert 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

Index: src/gpu/GrAARectRenderer.cpp

diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp

index 954a6f2d5d3d61e082c5001fc714a0f716f259eb..a08362264da63f619b929a9b7c938eb09b5085c2 100644

--- a/src/gpu/GrAARectRenderer.cpp

+++ b/src/gpu/GrAARectRenderer.cpp

@@ -43,11 +43,11 @@ public:

class GLEffect : public GrGLGeometryProcessor {

public:

- GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)

+ GLEffect(const GrBackendEffectFactory& factory, const GrEffect&)

: INHERITED (factory) {}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrDrawEffect& drawEffect,

+ const GrEffect& effect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

@@ -59,7 +59,7 @@ public:

const char *vsRectName, *fsRectName;

builder->addVarying(kVec4f_GrSLType, "Rect", &vsRectName, &fsRectName);

- const GrShaderVar& inRect = drawEffect.castEffect<GrAlignedRectEffect>().inRect();

+ const GrShaderVar& inRect = effect.cast<GrAlignedRectEffect>().inRect();

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();

vsBuilder->codeAppendf("\t%s = %s;\n", vsRectName, inRect.c_str());

@@ -92,9 +92,9 @@ public:

(GrGLSLExpr4(inputColor) * GrGLSLExpr1("coverage")).c_str());

}

- static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}

+ static void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}

- virtual void setData(const GrGLProgramDataManager& pdman, const GrDrawEffect&) SK_OVERRIDE {}

+ virtual void setData(const GrGLProgramDataManager& pdman, const GrEffect&) SK_OVERRIDE {}

private:

typedef GrGLGeometryProcessor INHERITED;

@@ -169,11 +169,11 @@ public:

class GLEffect : public GrGLGeometryProcessor {

public:

- GLEffect(const GrBackendEffectFactory& factory, const GrDrawEffect&)

+ GLEffect(const GrBackendEffectFactory& factory, const GrEffect&)

: INHERITED (factory) {}

virtual void emitCode(GrGLFullProgramBuilder* builder,

- const GrDrawEffect& drawEffect,

+ const GrEffect& effect,

const GrEffectKey& key,

const char* outputColor,

const char* inputColor,

@@ -185,7 +185,7 @@ public:

builder->addVarying(kVec4f_GrSLType, "RectEdge",

&vsRectEdgeName, &fsRectEdgeName);

- const GrRectEffect& rectEffect = drawEffect.castEffect<GrRectEffect>();

+ const GrRectEffect& rectEffect = effect.cast<GrRectEffect>();

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();

vsBuilder->codeAppendf("%s = %s;", vsRectEdgeName, rectEffect.inRectEdge().c_str());

@@ -233,9 +233,9 @@ public:

(GrGLSLExpr4(inputColor) * GrGLSLExpr1("coverage")).c_str());

}

- static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}

+ static void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder*) {}

- virtual void setData(const GrGLProgramDataManager& pdman, const GrDrawEffect&) SK_OVERRIDE {}

+ virtual void setData(const GrGLProgramDataManager& pdman, const GrEffect&) SK_OVERRIDE {}

private:

typedef GrGLGeometryProcessor INHERITED;

« no previous file with comments | « src/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrOvalRenderer.cpp » ('j') | no next file with comments »