src/effects/SkLightingImageFilter.cpp - Issue 648463003: FPs now use the correct builder types(just a rename)

Unified Diff: src/effects/SkLightingImageFilter.cpp

Issue 648463003: FPs now use the correct builder types(just a rename) (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 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/effects/SkLightingImageFilter.cpp

diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp

index 4a4665d4812ee22836d1fc1a225142554b1d9281..e78fd622a0ed2d9a52073d334cb3e6305afcb4fd 100644

--- a/src/effects/SkLightingImageFilter.cpp

+++ b/src/effects/SkLightingImageFilter.cpp

@@ -450,7 +450,7 @@ public:

* This is called by GrGLLightingEffect::emitCode() before either of the two virtual functions

* below. It adds a vec3f uniform visible in the FS that represents the constant light color.

- void emitLightColorUniform(GrGLProgramBuilder*);

+ void emitLightColorUniform(GrGLFPBuilder*);

/**

* These two functions are called from GrGLLightingEffect's emitCode() function.

@@ -460,8 +460,8 @@ public:

* the FS. The default of emitLightColor appends the name of the constant light color uniform

* and so this function only needs to be overridden if the light color varies spatially.

- virtual void emitSurfaceToLight(GrGLProgramBuilder*, const char* z) = 0;

- virtual void emitLightColor(GrGLProgramBuilder*, const char *surfaceToLight);

+ virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) = 0;

+ virtual void emitLightColor(GrGLFPBuilder*, const char *surfaceToLight);

// This is called from GrGLLightingEffect's setData(). Subclasses of GrGLLight must call

// INHERITED::setData().

@@ -488,7 +488,7 @@ public:

virtual ~GrGLDistantLight() {}

virtual void setData(const GrGLProgramDataManager&,

const SkLight* light) const SK_OVERRIDE;

- virtual void emitSurfaceToLight(GrGLProgramBuilder*, const char* z) SK_OVERRIDE;

+ virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE;

private:

typedef GrGLLight INHERITED;

@@ -502,7 +502,7 @@ public:

virtual ~GrGLPointLight() {}

virtual void setData(const GrGLProgramDataManager&,

const SkLight* light) const SK_OVERRIDE;

- virtual void emitSurfaceToLight(GrGLProgramBuilder*, const char* z) SK_OVERRIDE;

+ virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE;

private:

typedef GrGLLight INHERITED;

@@ -516,8 +516,8 @@ public:

virtual ~GrGLSpotLight() {}

virtual void setData(const GrGLProgramDataManager&,

const SkLight* light) const SK_OVERRIDE;

- virtual void emitSurfaceToLight(GrGLProgramBuilder*, const char* z) SK_OVERRIDE;

- virtual void emitLightColor(GrGLProgramBuilder*, const char *surfaceToLight) SK_OVERRIDE;

+ virtual void emitSurfaceToLight(GrGLFPBuilder*, const char* z) SK_OVERRIDE;

+ virtual void emitLightColor(GrGLFPBuilder*, const char *surfaceToLight) SK_OVERRIDE;

private:

typedef GrGLLight INHERITED;

@@ -1228,7 +1228,7 @@ public:

GrGLLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

virtual ~GrGLLightingEffect();

- virtual void emitCode(GrGLProgramBuilder*,

+ virtual void emitCode(GrGLFPBuilder*,

const GrFragmentProcessor&,

const GrProcessorKey&,

const char* outputColor,

@@ -1244,7 +1244,7 @@ public:

virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;

protected:

- virtual void emitLightFunc(GrGLProgramBuilder*, SkString* funcName) = 0;

+ virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) = 0;

private:

typedef GrGLFragmentProcessor INHERITED;

@@ -1259,7 +1259,7 @@ private:

class GrGLDiffuseLightingEffect : public GrGLLightingEffect {

public:

GrGLDiffuseLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitLightFunc(GrGLProgramBuilder*, SkString* funcName) SK_OVERRIDE;

+ virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE;

virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;

private:

@@ -1273,7 +1273,7 @@ private:

class GrGLSpecularLightingEffect : public GrGLLightingEffect {

public:

GrGLSpecularLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitLightFunc(GrGLProgramBuilder*, SkString* funcName) SK_OVERRIDE;

+ virtual void emitLightFunc(GrGLFPBuilder*, SkString* funcName) SK_OVERRIDE;

virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;

private:

@@ -1361,7 +1361,7 @@ GrGLLightingEffect::~GrGLLightingEffect() {

delete fLight;

}

-void GrGLLightingEffect::emitCode(GrGLProgramBuilder* builder,

+void GrGLLightingEffect::emitCode(GrGLFPBuilder* builder,

const GrFragmentProcessor&,

const GrProcessorKey& key,

const char* outputColor,

@@ -1387,7 +1387,7 @@ void GrGLLightingEffect::emitCode(GrGLProgramBuilder* builder,

GrGLShaderVar("scale", kFloat_GrSLType),

};

SkString sobelFuncName;

- GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

SkString coords2D = fsBuilder->ensureFSCoords2D(coords, 0);

fsBuilder->emitFunction(kFloat_GrSLType,

@@ -1483,7 +1483,7 @@ GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendProcessorFac

: INHERITED(factory, proc) {

}

-void GrGLDiffuseLightingEffect::emitLightFunc(GrGLProgramBuilder* builder, SkString* funcName) {

+void GrGLDiffuseLightingEffect::emitLightFunc(GrGLFPBuilder* builder, SkString* funcName) {

const char* kd;

fKDUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

kFloat_GrSLType,

@@ -1562,7 +1562,7 @@ GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrBackendProcessorF

: INHERITED(factory, proc) {

}

-void GrGLSpecularLightingEffect::emitLightFunc(GrGLProgramBuilder* builder, SkString* funcName) {

+void GrGLSpecularLightingEffect::emitLightFunc(GrGLFPBuilder* builder, SkString* funcName) {

const char* ks;

const char* shininess;

@@ -1598,12 +1598,12 @@ void GrGLSpecularLightingEffect::setData(const GrGLProgramDataManager& pdman,

}

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

-void GrGLLight::emitLightColorUniform(GrGLProgramBuilder* builder) {

+void GrGLLight::emitLightColorUniform(GrGLFPBuilder* builder) {

fColorUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

kVec3f_GrSLType, "LightColor");

}

-void GrGLLight::emitLightColor(GrGLProgramBuilder* builder,

+void GrGLLight::emitLightColor(GrGLFPBuilder* builder,

const char *surfaceToLight) {

builder->getFragmentShaderBuilder()->codeAppend(builder->getUniformCStr(this->lightColorUni()));

}

@@ -1623,7 +1623,7 @@ void GrGLDistantLight::setData(const GrGLProgramDataManager& pdman,

setUniformNormal3(pdman, fDirectionUni, distantLight->direction());

}

-void GrGLDistantLight::emitSurfaceToLight(GrGLProgramBuilder* builder, const char* z) {

+void GrGLDistantLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* dir;

fDirectionUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec3f_GrSLType,

"LightDirection", &dir);

@@ -1640,11 +1640,11 @@ void GrGLPointLight::setData(const GrGLProgramDataManager& pdman,

setUniformPoint3(pdman, fLocationUni, pointLight->location());

}

-void GrGLPointLight::emitSurfaceToLight(GrGLProgramBuilder* builder, const char* z) {

+void GrGLPointLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* loc;

fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility, kVec3f_GrSLType,

"LightLocation", &loc);

- GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",

loc, fsBuilder->fragmentPosition(), z);

}

@@ -1664,17 +1664,17 @@ void GrGLSpotLight::setData(const GrGLProgramDataManager& pdman,

setUniformNormal3(pdman, fSUni, spotLight->s());

}

-void GrGLSpotLight::emitSurfaceToLight(GrGLProgramBuilder* builder, const char* z) {

+void GrGLSpotLight::emitSurfaceToLight(GrGLFPBuilder* builder, const char* z) {

const char* location;

fLocationUni = builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,

kVec3f_GrSLType, "LightLocation", &location);

- GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("normalize(%s - vec3(%s.xy, %s))",

location, fsBuilder->fragmentPosition(), z);

}

-void GrGLSpotLight::emitLightColor(GrGLProgramBuilder* builder,

+void GrGLSpotLight::emitLightColor(GrGLFPBuilder* builder,

const char *surfaceToLight) {

const char* color = builder->getUniformCStr(this->lightColorUni()); // created by parent class.

@@ -1709,7 +1709,7 @@ void GrGLSpotLight::emitLightColor(GrGLProgramBuilder* builder,

color, cosOuter, coneScale);

lightColorBody.appendf("\t}\n");

lightColorBody.appendf("\treturn %s;\n", color);

- GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLFPFragmentBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->emitFunction(kVec3f_GrSLType,

"lightColor",

SK_ARRAY_COUNT(gLightColorArgs),

« no previous file with comments | « src/effects/SkDisplacementMapEffect.cpp ('k') | src/effects/SkLumaColorFilter.cpp » ('j') | no next file with comments »