| Index: src/effects/SkColorMatrixFilter.cpp
|
| diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
|
| index 31a76ab9cdfecb7d8271d7143a14bf8a399cb609..efbda83866800b46ff64acbc73fdbccc23f0ce4f 100644
|
| --- a/src/effects/SkColorMatrixFilter.cpp
|
| +++ b/src/effects/SkColorMatrixFilter.cpp
|
| @@ -428,7 +428,7 @@ public:
|
| builder->fsCodeAppendf("\t%s.rgb *= %s.a;\n", outputColor, outputColor);
|
| }
|
|
|
| - virtual void setData(const GrGLUniformManager& uniManager,
|
| + virtual void setData(const GrGLProgramResourceManager& uniManager,
|
| const GrDrawEffect& drawEffect) SK_OVERRIDE {
|
| const ColorMatrixEffect& cme = drawEffect.castEffect<ColorMatrixEffect>();
|
| const float* m = cme.fMatrix.fMat;
|
| @@ -448,9 +448,8 @@ public:
|
| }
|
|
|
| private:
|
| - GrGLUniformManager::UniformHandle fMatrixHandle;
|
| - GrGLUniformManager::UniformHandle fVectorHandle;
|
| -
|
| + GrGLProgramResourceManager::UniformHandle fMatrixHandle;
|
| + GrGLProgramResourceManager::UniformHandle fVectorHandle;
|
| typedef GrGLEffect INHERITED;
|
| };
|
|
|
|
|