src/gpu/effects/GrDistanceFieldTextureEffect.h - Issue 582963002: Solo gp

Unified Diff: src/gpu/effects/GrDistanceFieldTextureEffect.h

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

Patch Set: rebase 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/effects/GrDistanceFieldTextureEffect.h

diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h

index 5f08edaa7952c98e7a9af7557207b9047fce9cbc..b8d774d6101dde312c2a80e1b9f0e9b8ab1b321a 100644

--- a/src/gpu/effects/GrDistanceFieldTextureEffect.h

+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h

@@ -8,7 +8,7 @@

#ifndef GrDistanceFieldTextureEffect_DEFINED

#define GrDistanceFieldTextureEffect_DEFINED

-#include "GrEffect.h"

+#include "GrProcessor.h"

#include "GrGeometryProcessor.h"

class GrGLDistanceFieldTextureEffect;

@@ -41,15 +41,15 @@ enum GrDistanceFieldEffectFlags {

class GrDistanceFieldTextureEffect : public GrGeometryProcessor {

public:

#ifdef SK_GAMMA_APPLY_TO_A8

- static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,

- GrTexture* gamma, const GrTextureParams& gammaParams, float lum,

- uint32_t flags) {

+ static GrGeometryProcessor* Create(GrTexture* tex, const GrTextureParams& params,

+ GrTexture* gamma, const GrTextureParams& gammaParams,

+ float lum, uint32_t flags) {

return SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, gamma, gammaParams, lum,

flags));

}

#else

- static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,

- uint32_t flags) {

+ static GrGeometryProcessor* Create(GrTexture* tex, const GrTextureParams& params,

+ uint32_t flags) {

return SkNEW_ARGS(GrDistanceFieldTextureEffect, (tex, params, flags));

}

#endif

@@ -66,9 +66,9 @@ public:

#endif

uint32_t getFlags() const { return fFlags; }

- typedef GrGLDistanceFieldTextureEffect GLEffect;

+ typedef GrGLDistanceFieldTextureEffect GLProcessor;

- virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;

+ virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;

private:

GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params,

@@ -77,7 +77,7 @@ private:

#endif

uint32_t flags);

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

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

GrTextureAccess fTextureAccess;

#ifdef SK_GAMMA_APPLY_TO_A8

@@ -87,9 +87,9 @@ private:

uint32_t fFlags;

const GrShaderVar& fInTextureCoords;

- GR_DECLARE_EFFECT_TEST;

+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST;

- typedef GrEffect INHERITED;

+ typedef GrFragmentProcessor INHERITED;

};

/**

@@ -100,9 +100,9 @@ private:

class GrDistanceFieldLCDTextureEffect : public GrGeometryProcessor {

public:

- static GrEffect* Create(GrTexture* tex, const GrTextureParams& params,

- GrTexture* gamma, const GrTextureParams& gammaParams,

- SkColor textColor, uint32_t flags) {

+ static GrGeometryProcessor* Create(GrTexture* tex, const GrTextureParams& params,

+ GrTexture* gamma, const GrTextureParams& gammaParams,

+ SkColor textColor, uint32_t flags) {

return SkNEW_ARGS(GrDistanceFieldLCDTextureEffect,

(tex, params, gamma, gammaParams, textColor, flags));

}

@@ -116,9 +116,9 @@ public:

GrColor getTextColor() const { return fTextColor; }

uint32_t getFlags() const { return fFlags; }

- typedef GrGLDistanceFieldLCDTextureEffect GLEffect;

+ typedef GrGLDistanceFieldLCDTextureEffect GLProcessor;

- virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;

+ virtual const GrBackendGeometryProcessorFactory& getFactory() const SK_OVERRIDE;

private:

GrDistanceFieldLCDTextureEffect(GrTexture* texture, const GrTextureParams& params,

@@ -126,7 +126,7 @@ private:

SkColor textColor,

uint32_t flags);

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

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

GrTextureAccess fTextureAccess;

GrTextureAccess fGammaTextureAccess;

@@ -134,9 +134,9 @@ private:

uint32_t fFlags;

const GrShaderVar& fInTextureCoords;

- GR_DECLARE_EFFECT_TEST;

+ GR_DECLARE_GEOMETRY_PROCESSOR_TEST;

- typedef GrEffect INHERITED;

+ typedef GrFragmentProcessor INHERITED;

};

#endif

« no previous file with comments | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/effects/GrDistanceFieldTextureEffect.cpp » ('j') | no next file with comments »