| Index: src/effects/SkMagnifierImageFilter.cpp
|
| diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
|
| index 2d90c4478139d27dbc0192633c7a5c3d33f6f764..1e058c34f451b567e13437bb5f5efdf50028ac24 100644
|
| --- a/src/effects/SkMagnifierImageFilter.cpp
|
| +++ b/src/effects/SkMagnifierImageFilter.cpp
|
| @@ -33,9 +33,10 @@ public:
|
| float xInvZoom,
|
| float yInvZoom,
|
| float xInvInset,
|
| - float yInvInset) {
|
| - return new GrMagnifierEffect(texture, bounds, xOffset, yOffset, xInvZoom, yInvZoom, xInvInset,
|
| - yInvInset);
|
| + float yInvInset,
|
| + GrRenderTarget* dst) {
|
| + return new GrMagnifierEffect(texture, bounds, xOffset, yOffset, xInvZoom,
|
| + yInvZoom, xInvInset, yInvInset, dst);
|
| }
|
|
|
| virtual ~GrMagnifierEffect() {};
|
| @@ -63,8 +64,8 @@ private:
|
| float xInvZoom,
|
| float yInvZoom,
|
| float xInvInset,
|
| - float yInvInset)
|
| - : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture))
|
| + float yInvInset, GrRenderTarget* dst)
|
| + : INHERITED(texture, GrCoordTransform::MakeDivByTextureWHMatrix(texture), kLocal_GrCoordSet, dst)
|
| , fBounds(bounds)
|
| , fXOffset(xOffset)
|
| , fYOffset(yOffset)
|
| @@ -211,7 +212,7 @@ const GrFragmentProcessor* GrMagnifierEffect::TestCreate(GrProcessorTestData* d)
|
| texture->width() / (float) x,
|
| texture->height() / (float) y,
|
| (float) inset / texture->width(),
|
| - (float) inset / texture->height());
|
| + (float) inset / texture->height(), NULL);
|
| SkASSERT(effect);
|
| return effect;
|
| }
|
| @@ -260,7 +261,7 @@ SkMagnifierImageFilter::SkMagnifierImageFilter(const SkRect& srcRect, SkScalar i
|
| #if SK_SUPPORT_GPU
|
| bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,
|
| GrTexture* texture, const SkMatrix&,
|
| - const SkIRect&bounds) const {
|
| + const SkIRect&bounds, GrRenderTarget* dst) const {
|
| if (fp) {
|
| SkScalar yOffset = texture->origin() == kTopLeft_GrSurfaceOrigin ? fSrcRect.y() :
|
| texture->height() - fSrcRect.height() * texture->height() / bounds.height()
|
| @@ -280,7 +281,7 @@ bool SkMagnifierImageFilter::asFragmentProcessor(GrFragmentProcessor** fp,
|
| fSrcRect.width() / bounds.width(),
|
| fSrcRect.height() / bounds.height(),
|
| bounds.width() * invInset,
|
| - bounds.height() * invInset);
|
| + bounds.height() * invInset, dst);
|
| }
|
| return true;
|
| }
|
|
|