Make all remaining effects use GrGLEffectMatrix
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6817079
git-svn-id: http://skia.googlecode.com/svn/trunk@6286 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/effects/Gr1DKernelEffect.h b/src/gpu/effects/Gr1DKernelEffect.h
index f176cdd..1712733 100644
--- a/src/gpu/effects/Gr1DKernelEffect.h
+++ b/src/gpu/effects/Gr1DKernelEffect.h
@@ -9,7 +9,6 @@
#define Gr1DKernelEffect_DEFINED
#include "GrSingleTextureEffect.h"
-#include "GrTexture.h"
#include "SkMatrix.h"
/**
@@ -21,15 +20,6 @@
* two times the radius.
*/
-namespace {
-inline SkMatrix make_texture_matrix(GrTexture* tex) {
- GrAssert(NULL != tex);
- SkMatrix mat;
- mat.setIDiv(tex->width(), tex->height());
- return mat;
-}
-}
-
class Gr1DKernelEffect : public GrSingleTextureEffect {
public:
@@ -41,7 +31,7 @@
Gr1DKernelEffect(GrTexture* texture,
Direction direction,
int radius)
- : GrSingleTextureEffect(texture, make_texture_matrix(texture))
+ : GrSingleTextureEffect(texture, MakeDivByTextureWHMatrix(texture))
, fDirection(direction)
, fRadius(radius) {}