| Index: src/gpu/effects/GrBitmapTextGeoProc.h
|
| diff --git a/src/gpu/effects/GrCustomCoordsTextureEffect.h b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| similarity index 77%
|
| rename from src/gpu/effects/GrCustomCoordsTextureEffect.h
|
| rename to src/gpu/effects/GrBitmapTextGeoProc.h
|
| index a2b62ed3b80f3bb0c002ba80105a90e28db65f6a..ecbf4f947035b714f52a2dd883b907e6baa5303c 100644
|
| --- a/src/gpu/effects/GrCustomCoordsTextureEffect.h
|
| +++ b/src/gpu/effects/GrBitmapTextGeoProc.h
|
| @@ -5,13 +5,13 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -#ifndef GrCustomCoordsTextureEffect_DEFINED
|
| -#define GrCustomCoordsTextureEffect_DEFINED
|
| +#ifndef GrBitmapTextGeoProc_DEFINED
|
| +#define GrBitmapTextGeoProc_DEFINED
|
|
|
| #include "GrProcessor.h"
|
| #include "GrGeometryProcessor.h"
|
|
|
| -class GrGLCustomCoordsTextureEffect;
|
| +class GrGLBitmapTextGeoProc;
|
| class GrInvariantOutput;
|
|
|
| /**
|
| @@ -19,13 +19,14 @@ class GrInvariantOutput;
|
| * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
|
| * coords are a custom attribute.
|
| */
|
| -class GrCustomCoordsTextureEffect : public GrGeometryProcessor {
|
| +class GrBitmapTextGeoProc : public GrGeometryProcessor {
|
| public:
|
| - static GrGeometryProcessor* Create(GrTexture* tex, const GrTextureParams& p, bool hasColor) {
|
| - return SkNEW_ARGS(GrCustomCoordsTextureEffect, (tex, p, hasColor));
|
| + static GrGeometryProcessor* Create(GrTexture* tex, const GrTextureParams& p,
|
| + bool useColorAttrib) {
|
| + return SkNEW_ARGS(GrBitmapTextGeoProc, (tex, p, useColorAttrib));
|
| }
|
|
|
| - virtual ~GrCustomCoordsTextureEffect() {}
|
| + virtual ~GrBitmapTextGeoProc() {}
|
|
|
| virtual const char* name() const SK_OVERRIDE { return "Texture"; }
|
|
|
| @@ -40,7 +41,7 @@ public:
|
| virtual GrGLGeometryProcessor* createGLInstance(const GrBatchTracker& bt) const SK_OVERRIDE;
|
|
|
| private:
|
| - GrCustomCoordsTextureEffect(GrTexture* texture, const GrTextureParams& params, bool hasColor);
|
| + GrBitmapTextGeoProc(GrTexture* texture, const GrTextureParams& params, bool useColorAttrib);
|
|
|
| virtual bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE;
|
|
|
|
|