src/effects/SkLightingImageFilter.cpp - Issue 582963002: Solo gp

Unified Diff: src/effects/SkLightingImageFilter.cpp

Issue 582963002: Solo gp (Closed) Base URL: https://skia.googlesource.com/skia.git@no_peb

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

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

index 95e9965f29e91df578693a08529f5f5f3a59ced9..f766562128cd6c1c65a700f6172b3fb19a1d5aac 100644

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

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

@@ -16,10 +16,10 @@

#if SK_SUPPORT_GPU

#include "effects/GrSingleTextureEffect.h"

-#include "gl/GrGLEffect.h"

+#include "gl/GrGLProcessor.h"

#include "gl/builders/GrGLProgramBuilder.h"

-#include "GrEffect.h"

-#include "GrTBackendEffectFactory.h"

+#include "GrProcessor.h"

+#include "GrTBackendProcessorFactory.h"

class GrGLDiffuseLightingEffect;

class GrGLSpecularLightingEffect;

@@ -36,12 +36,14 @@ const SkScalar gOneHalf = 0.5f;

const SkScalar gOneQuarter = 0.25f;

#if SK_SUPPORT_GPU

-void setUniformPoint3(const GrGLProgramDataManager& pdman, UniformHandle uni, const SkPoint3& point) {

+void setUniformPoint3(const GrGLProgramDataManager& pdman, UniformHandle uni,

+ const SkPoint3& point) {

GR_STATIC_ASSERT(sizeof(SkPoint3) == 3 * sizeof(GrGLfloat));

pdman.set3fv(uni, 1, &point.fX);

}

-void setUniformNormal3(const GrGLProgramDataManager& pdman, UniformHandle uni, const SkPoint3& point) {

+void setUniformNormal3(const GrGLProgramDataManager& pdman, UniformHandle uni,

+ const SkPoint3& point) {

setUniformPoint3(pdman, uni, SkPoint3(point.fX, point.fY, point.fZ));

}

#endif

@@ -60,7 +62,8 @@ class DiffuseLightingType {

public:

DiffuseLightingType(SkScalar kd)

: fKD(kd) {}

- SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight, const SkPoint3& lightColor) const {

+ SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight,

+ const SkPoint3& lightColor) const {

SkScalar colorScale = SkScalarMul(fKD, normal.dot(surfaceTolight));

colorScale = SkScalarClampMax(colorScale, SK_Scalar1);

SkPoint3 color(lightColor * colorScale);

@@ -77,7 +80,8 @@ class SpecularLightingType {

public:

SpecularLightingType(SkScalar ks, SkScalar shininess)

: fKS(ks), fShininess(shininess) {}

- SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight, const SkPoint3& lightColor) const {

+ SkPMColor light(const SkPoint3& normal, const SkPoint3& surfaceTolight,

+ const SkPoint3& lightColor) const {

SkPoint3 halfDir(surfaceTolight);

halfDir.fZ += SK_Scalar1; // eye position is always (0, 0, 1)

halfDir.normalize();

@@ -162,7 +166,9 @@ inline SkPoint3 bottomRightNormal(int m[9], SkScalar surfaceScale) {

surfaceScale);

}

-template <class LightingType, class LightType> void lightBitmap(const LightingType& lightingType, const SkLight* light, const SkBitmap& src, SkBitmap* dst, SkScalar surfaceScale, const SkIRect& bounds) {

+template <class LightingType, class LightType> void lightBitmap(

+ const LightingType& lightingType, const SkLight* light, const SkBitmap& src, SkBitmap* dst,

+ SkScalar surfaceScale, const SkIRect& bounds) {

SkASSERT(dst->width() == bounds.width() && dst->height() == bounds.height());

const LightType* l = static_cast<const LightType*>(light);

int left = bounds.left(), right = bounds.right();

@@ -179,18 +185,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy

m[7] = SkGetPackedA32(*row2++);

m[8] = SkGetPackedA32(*row2++);

SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(topLeftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(topLeftNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

for (++x; x < right - 1; ++x)

{

shiftMatrixLeft(m);

m[5] = SkGetPackedA32(*row1++);

m[8] = SkGetPackedA32(*row2++);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(topNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(topNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

shiftMatrixLeft(m);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(topRightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(topRightNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

for (++y; y < bottom - 1; ++y) {

@@ -206,18 +215,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy

m[7] = SkGetPackedA32(*row2++);

m[8] = SkGetPackedA32(*row2++);

SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(leftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(leftNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

for (++x; x < right - 1; ++x) {

shiftMatrixLeft(m);

m[2] = SkGetPackedA32(*row0++);

m[5] = SkGetPackedA32(*row1++);

m[8] = SkGetPackedA32(*row2++);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(interiorNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(interiorNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

shiftMatrixLeft(m);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(rightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(rightNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

{

@@ -230,18 +242,21 @@ template <class LightingType, class LightType> void lightBitmap(const LightingTy

m[4] = SkGetPackedA32(*row1++);

m[5] = SkGetPackedA32(*row1++);

SkPoint3 surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(bottomLeftNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(bottomLeftNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

for (++x; x < right - 1; ++x)

{

shiftMatrixLeft(m);

m[2] = SkGetPackedA32(*row0++);

m[5] = SkGetPackedA32(*row1++);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(bottomNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(bottomNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

shiftMatrixLeft(m);

surfaceToLight = l->surfaceToLight(x, y, m[4], surfaceScale);

- *dptr++ = lightingType.light(bottomRightNormal(m, surfaceScale), surfaceToLight, l->lightColor(surfaceToLight));

+ *dptr++ = lightingType.light(bottomRightNormal(m, surfaceScale), surfaceToLight,

+ l->lightColor(surfaceToLight));

}

@@ -281,8 +296,8 @@ protected:

virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,

SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;

#if SK_SUPPORT_GPU

- virtual bool asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix& matrix,

- const SkIRect& bounds) const SK_OVERRIDE;

+ virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,

+ const SkIRect& bounds) const SK_OVERRIDE;

#endif

private:

@@ -294,7 +309,8 @@ private:

class SkSpecularLightingImageFilter : public SkLightingImageFilter {

public:

static SkImageFilter* Create(SkLight* light, SkScalar surfaceScale,

- SkScalar ks, SkScalar shininess, SkImageFilter*, const CropRect*, uint32_t uniqueID = 0);

+ SkScalar ks, SkScalar shininess, SkImageFilter*, const CropRect*,

+ uint32_t uniqueID = 0);

SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSpecularLightingImageFilter)

@@ -312,8 +328,8 @@ protected:

virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,

SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;

#if SK_SUPPORT_GPU

- virtual bool asNewEffect(GrEffect** effect, GrTexture*, const SkMatrix& matrix,

- const SkIRect& bounds) const SK_OVERRIDE;

+ virtual bool asFragmentProcessor(GrFragmentProcessor**, GrTexture*, const SkMatrix&,

+ const SkIRect& bounds) const SK_OVERRIDE;

#endif

private:

@@ -341,7 +357,7 @@ public:

}

protected:

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

+ virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;

private:

typedef GrSingleTextureEffect INHERITED;

@@ -352,11 +368,11 @@ private:

class GrDiffuseLightingEffect : public GrLightingEffect {

public:

- static GrEffect* Create(GrTexture* texture,

- const SkLight* light,

- SkScalar surfaceScale,

- const SkMatrix& matrix,

- SkScalar kd) {

+ static GrFragmentProcessor* Create(GrTexture* texture,

+ const SkLight* light,

+ SkScalar surfaceScale,

+ const SkMatrix& matrix,

+ SkScalar kd) {

return SkNEW_ARGS(GrDiffuseLightingEffect, (texture,

light,

surfaceScale,

@@ -366,13 +382,13 @@ public:

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

- typedef GrGLDiffuseLightingEffect GLEffect;

+ typedef GrGLDiffuseLightingEffect GLProcessor;

- virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;

+ virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;

SkScalar kd() const { return fKD; }

private:

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

+ virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;

GrDiffuseLightingEffect(GrTexture* texture,

const SkLight* light,

@@ -380,19 +396,19 @@ private:

const SkMatrix& matrix,

SkScalar kd);

- GR_DECLARE_EFFECT_TEST;

+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST;

typedef GrLightingEffect INHERITED;

SkScalar fKD;

};

class GrSpecularLightingEffect : public GrLightingEffect {

public:

- static GrEffect* Create(GrTexture* texture,

- const SkLight* light,

- SkScalar surfaceScale,

- const SkMatrix& matrix,

- SkScalar ks,

- SkScalar shininess) {

+ static GrFragmentProcessor* Create(GrTexture* texture,

+ const SkLight* light,

+ SkScalar surfaceScale,

+ const SkMatrix& matrix,

+ SkScalar ks,

+ SkScalar shininess) {

return SkNEW_ARGS(GrSpecularLightingEffect, (texture,

light,

surfaceScale,

@@ -402,14 +418,14 @@ public:

}

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

- typedef GrGLSpecularLightingEffect GLEffect;

+ typedef GrGLSpecularLightingEffect GLProcessor;

- virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;

+ virtual const GrBackendFragmentProcessorFactory& getFactory() const SK_OVERRIDE;

SkScalar ks() const { return fKS; }

SkScalar shininess() const { return fShininess; }

private:

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

+ virtual bool onIsEqual(const GrProcessor&) const SK_OVERRIDE;

GrSpecularLightingEffect(GrTexture* texture,

const SkLight* light,

@@ -418,7 +434,7 @@ private:

SkScalar ks,

SkScalar shininess);

- GR_DECLARE_EFFECT_TEST;

+ GR_DECLARE_FRAGMENT_PROCESSOR_TEST;

typedef GrLightingEffect INHERITED;

SkScalar fKS;

SkScalar fShininess;

@@ -1042,11 +1058,13 @@ bool SkDiffuseLightingImageFilter::onFilterImage(Proxy* proxy,

}

#if SK_SUPPORT_GPU

-bool SkDiffuseLightingImageFilter::asNewEffect(GrEffect** effect, GrTexture* texture,

- const SkMatrix& matrix, const SkIRect&) const {

- if (effect) {

+bool SkDiffuseLightingImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,

+ GrTexture* texture,

+ const SkMatrix& matrix,

+ const SkIRect&) const {

+ if (fp) {

SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));

- *effect = GrDiffuseLightingEffect::Create(texture, light(), scale, matrix, kd());

+ *fp = GrDiffuseLightingEffect::Create(texture, light(), scale, matrix, kd());

}

return true;

}

@@ -1158,11 +1176,13 @@ bool SkSpecularLightingImageFilter::onFilterImage(Proxy* proxy,

}

#if SK_SUPPORT_GPU

-bool SkSpecularLightingImageFilter::asNewEffect(GrEffect** effect, GrTexture* texture,

- const SkMatrix& matrix, const SkIRect&) const {

- if (effect) {

+bool SkSpecularLightingImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,

+ GrTexture* texture,

+ const SkMatrix& matrix,

+ const SkIRect&) const {

+ if (fp) {

SkScalar scale = SkScalarMul(surfaceScale(), SkIntToScalar(255));

- *effect = GrSpecularLightingEffect::Create(texture, light(), scale, matrix, ks(), shininess());

+ *fp = GrSpecularLightingEffect::Create(texture, light(), scale, matrix, ks(), shininess());

}

return true;

}

@@ -1203,32 +1223,31 @@ SkLight* create_random_light(SkRandom* random) {

}

-class GrGLLightingEffect : public GrGLEffect {

+class GrGLLightingEffect : public GrGLFragmentProcessor {

public:

- GrGLLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect);

+ GrGLLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

virtual ~GrGLLightingEffect();

virtual void emitCode(GrGLProgramBuilder*,

- const GrEffect&,

- const GrEffectKey&,

+ const GrFragmentProcessor&,

+ const GrProcessorKey&,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- static inline void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder* b);

+ static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder* b);

/**

* Subclasses of GrGLLightingEffect must call INHERITED::setData();

- virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE;

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

protected:

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

private:

- typedef GrGLEffect INHERITED;

+ typedef GrGLFragmentProcessor INHERITED;

UniformHandle fImageIncrementUni;

UniformHandle fSurfaceScaleUni;

@@ -1239,10 +1258,9 @@ private:

class GrGLDiffuseLightingEffect : public GrGLLightingEffect {

public:

- GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect);

+ GrGLDiffuseLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

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

- virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE;

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

private:

typedef GrGLLightingEffect INHERITED;

@@ -1254,10 +1272,9 @@ private:

class GrGLSpecularLightingEffect : public GrGLLightingEffect {

public:

- GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect);

+ GrGLSpecularLightingEffect(const GrBackendProcessorFactory&, const GrProcessor&);

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

- virtual void setData(const GrGLProgramDataManager&, const GrEffect&) SK_OVERRIDE;

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

private:

typedef GrGLLightingEffect INHERITED;

@@ -1286,7 +1303,7 @@ GrLightingEffect::~GrLightingEffect() {

fLight->unref();

}

-bool GrLightingEffect::onIsEqual(const GrEffect& sBase) const {

+bool GrLightingEffect::onIsEqual(const GrProcessor& sBase) const {

const GrLightingEffect& s = sBase.cast<GrLightingEffect>();

return this->texture(0) == s.texture(0) &&

fLight->isEqual(*s.fLight) &&

@@ -1303,19 +1320,19 @@ GrDiffuseLightingEffect::GrDiffuseLightingEffect(GrTexture* texture,

: INHERITED(texture, light, surfaceScale, matrix), fKD(kd) {

}

-const GrBackendEffectFactory& GrDiffuseLightingEffect::getFactory() const {

- return GrTBackendEffectFactory<GrDiffuseLightingEffect>::getInstance();

+const GrBackendFragmentProcessorFactory& GrDiffuseLightingEffect::getFactory() const {

+ return GrTBackendFragmentProcessorFactory<GrDiffuseLightingEffect>::getInstance();

}

-bool GrDiffuseLightingEffect::onIsEqual(const GrEffect& sBase) const {

+bool GrDiffuseLightingEffect::onIsEqual(const GrProcessor& sBase) const {

const GrDiffuseLightingEffect& s = sBase.cast<GrDiffuseLightingEffect>();

return INHERITED::onIsEqual(sBase) &&

this->kd() == s.kd();

}

-GR_DEFINE_EFFECT_TEST(GrDiffuseLightingEffect);

+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDiffuseLightingEffect);

-GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random,

+GrFragmentProcessor* GrDiffuseLightingEffect::TestCreate(SkRandom* random,

GrContext* context,

const GrDrawTargetCaps&,

GrTexture* textures[]) {

@@ -1326,17 +1343,17 @@ GrEffect* GrDiffuseLightingEffect::TestCreate(SkRandom* random,

for (int i = 0; i < 9; i++) {

matrix[i] = random->nextUScalar1();

}

- return GrDiffuseLightingEffect::Create(textures[GrEffectUnitTest::kAlphaTextureIdx],

+ return GrDiffuseLightingEffect::Create(textures[GrProcessorUnitTest::kAlphaTextureIdx],

light, surfaceScale, matrix, kd);

}

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

-GrGLLightingEffect::GrGLLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect)

+GrGLLightingEffect::GrGLLightingEffect(const GrBackendProcessorFactory& factory,

+ const GrProcessor& fp)

: INHERITED(factory) {

- const GrLightingEffect& m = effect.cast<GrLightingEffect>();

+ const GrLightingEffect& m = fp.cast<GrLightingEffect>();

fLight = m.light()->createGLLight();

}

@@ -1345,8 +1362,8 @@ GrGLLightingEffect::~GrGLLightingEffect() {

}

void GrGLLightingEffect::emitCode(GrGLProgramBuilder* builder,

- const GrEffect&,

- const GrEffectKey& key,

+ const GrFragmentProcessor&,

+ const GrProcessorKey& key,

const char* outputColor,

const char* inputColor,

const TransformedCoordsArray& coords,

@@ -1441,14 +1458,14 @@ void GrGLLightingEffect::emitCode(GrGLProgramBuilder* builder,

fsBuilder->codeAppend(modulate.c_str());

}

-void GrGLLightingEffect::GenKey(const GrEffect& effect,

- const GrGLCaps& caps, GrEffectKeyBuilder* b) {

- b->add32(effect.cast<GrLightingEffect>().light()->type());

+void GrGLLightingEffect::GenKey(const GrProcessor& proc,

+ const GrGLCaps& caps, GrProcessorKeyBuilder* b) {

+ b->add32(proc.cast<GrLightingEffect>().light()->type());

}

void GrGLLightingEffect::setData(const GrGLProgramDataManager& pdman,

- const GrEffect& effect) {

- const GrLightingEffect& lighting = effect.cast<GrLightingEffect>();

+ const GrProcessor& proc) {

+ const GrLightingEffect& lighting = proc.cast<GrLightingEffect>();

GrTexture* texture = lighting.texture(0);

float ySign = texture->origin() == kTopLeft_GrSurfaceOrigin ? -1.0f : 1.0f;

pdman.set2f(fImageIncrementUni, 1.0f / texture->width(), ySign / texture->height());

@@ -1461,9 +1478,9 @@ void GrGLLightingEffect::setData(const GrGLProgramDataManager& pdman,

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

-GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect)

- : INHERITED(factory, effect) {

+GrGLDiffuseLightingEffect::GrGLDiffuseLightingEffect(const GrBackendProcessorFactory& factory,

+ const GrProcessor& proc)

+ : INHERITED(factory, proc) {

}

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

@@ -1490,9 +1507,9 @@ void GrGLDiffuseLightingEffect::emitLightFunc(GrGLProgramBuilder* builder, SkStr

}

void GrGLDiffuseLightingEffect::setData(const GrGLProgramDataManager& pdman,

- const GrEffect& effect) {

- INHERITED::setData(pdman, effect);

- const GrDiffuseLightingEffect& diffuse = effect.cast<GrDiffuseLightingEffect>();

+ const GrProcessor& proc) {

+ INHERITED::setData(pdman, proc);

+ const GrDiffuseLightingEffect& diffuse = proc.cast<GrDiffuseLightingEffect>();

pdman.set1f(fKDUni, diffuse.kd());

}

@@ -1509,23 +1526,23 @@ GrSpecularLightingEffect::GrSpecularLightingEffect(GrTexture* texture,

fShininess(shininess) {

}

-const GrBackendEffectFactory& GrSpecularLightingEffect::getFactory() const {

- return GrTBackendEffectFactory<GrSpecularLightingEffect>::getInstance();

+const GrBackendFragmentProcessorFactory& GrSpecularLightingEffect::getFactory() const {

+ return GrTBackendFragmentProcessorFactory<GrSpecularLightingEffect>::getInstance();

}

-bool GrSpecularLightingEffect::onIsEqual(const GrEffect& sBase) const {

+bool GrSpecularLightingEffect::onIsEqual(const GrProcessor& sBase) const {

const GrSpecularLightingEffect& s = sBase.cast<GrSpecularLightingEffect>();

return INHERITED::onIsEqual(sBase) &&

this->ks() == s.ks() &&

this->shininess() == s.shininess();

}

-GR_DEFINE_EFFECT_TEST(GrSpecularLightingEffect);

+GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSpecularLightingEffect);

-GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random,

- GrContext* context,

- const GrDrawTargetCaps&,

- GrTexture* textures[]) {

+GrFragmentProcessor* GrSpecularLightingEffect::TestCreate(SkRandom* random,

+ GrContext* context,

+ const GrDrawTargetCaps&,

+ GrTexture* textures[]) {

SkScalar surfaceScale = random->nextSScalar1();

SkScalar ks = random->nextUScalar1();

SkScalar shininess = random->nextUScalar1();

@@ -1534,15 +1551,15 @@ GrEffect* GrSpecularLightingEffect::TestCreate(SkRandom* random,

for (int i = 0; i < 9; i++) {

matrix[i] = random->nextUScalar1();

}

- return GrSpecularLightingEffect::Create(textures[GrEffectUnitTest::kAlphaTextureIdx],

+ return GrSpecularLightingEffect::Create(textures[GrProcessorUnitTest::kAlphaTextureIdx],

light, surfaceScale, matrix, ks, shininess);

}

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

-GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrBackendEffectFactory& factory,

- const GrEffect& effect)

- : INHERITED(factory, effect) {

+GrGLSpecularLightingEffect::GrGLSpecularLightingEffect(const GrBackendProcessorFactory& factory,

+ const GrProcessor& proc)

+ : INHERITED(factory, proc) {

}

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

@@ -1573,7 +1590,7 @@ void GrGLSpecularLightingEffect::emitLightFunc(GrGLProgramBuilder* builder, SkSt

}

void GrGLSpecularLightingEffect::setData(const GrGLProgramDataManager& pdman,

- const GrEffect& effect) {

+ const GrProcessor& effect) {

INHERITED::setData(pdman, effect);

const GrSpecularLightingEffect& spec = effect.cast<GrSpecularLightingEffect>();

pdman.set1f(fKSUni, spec.ks());

@@ -1588,8 +1605,7 @@ void GrGLLight::emitLightColorUniform(GrGLProgramBuilder* builder) {

void GrGLLight::emitLightColor(GrGLProgramBuilder* builder,

const char *surfaceToLight) {

- builder->getFragmentShaderBuilder()->

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

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

}

void GrGLLight::setData(const GrGLProgramDataManager& pdman,

« include/gpu/GrTypesPriv.h ('K') | « src/effects/SkGpuBlurUtils.cpp ('k') | src/effects/SkLumaColorFilter.cpp » ('j') | src/gpu/gl/GrGLProcessor.h » ('J')