| Index: src/gpu/effects/GrCustomCoordsTextureEffect.cpp
|
| diff --git a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
|
| index a132e86cf9e3e1104e5c868c6ad5dc4f04ab61bb..597fa8cf3e7f71252c8690506dcf407cfbb9cff6 100644
|
| --- a/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
|
| +++ b/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
|
| @@ -67,10 +67,11 @@ private:
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrCustomCoordsTextureEffect::GrCustomCoordsTextureEffect(GrTexture* texture,
|
| +GrCustomCoordsTextureEffect::GrCustomCoordsTextureEffect(GrColor color,
|
| + GrTexture* texture,
|
| const GrTextureParams& params,
|
| bool hasColor)
|
| - : fTextureAccess(texture, params), fInColor(NULL) {
|
| + : INHERITED(color), fTextureAccess(texture, params), fInColor(NULL) {
|
| this->initClassID<GrCustomCoordsTextureEffect>();
|
| fInPosition = &this->addVertexAttrib(GrAttribute("inPosition", kVec2f_GrVertexAttribType));
|
| if (hasColor) {
|
| @@ -129,5 +130,5 @@ GrGeometryProcessor* GrCustomCoordsTextureEffect::TestCreate(SkRandom* random,
|
| GrTextureParams params(tileModes, random->nextBool() ? GrTextureParams::kBilerp_FilterMode :
|
| GrTextureParams::kNone_FilterMode);
|
|
|
| - return GrCustomCoordsTextureEffect::Create(textures[texIdx], params, random->nextBool());
|
| + return GrCustomCoordsTextureEffect::Create(GrRandomColor(random), textures[texIdx], params, random->nextBool());
|
| }
|
|
|