AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement a computeFastBounds() traversal for SkImageFilter.

Browse Source 
This allows for correct culling of primitives which have image filters applied.

R=reed@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/137423005

git-svn-id: http://skia.googlecode.com/svn/trunk@13207 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2014-01-27 21:03:17 +00:00
parent 99f381ad76
commit 336d1d7595
16 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/core/SkImageFilter.h
View File

@ -143,6 +143,9 @@ public:
*/
bool cropRectIsSet() const { return fCropRect.flags() != 0x0; }
// Default impl returns union of all input bounds.
virtual void computeFastBounds(const SkRect&, SkRect*) const;
SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter)
protected:

1
include/core/SkPaint.h
View File

@ -943,6 +943,7 @@ public:
uintptr_t effects = reinterpret_cast<uintptr_t>(this->getLooper());
effects |= reinterpret_cast<uintptr_t>(this->getMaskFilter());
effects |= reinterpret_cast<uintptr_t>(this->getPathEffect());
effects |= reinterpret_cast<uintptr_t>(this->getImageFilter());
if (!effects) {
return orig;
}

1
include/effects/SkBitmapSource.h
View File

@ -15,6 +15,7 @@ class SK_API SkBitmapSource : public SkImageFilter {
public:
explicit SkBitmapSource(const SkBitmap& bitmap);
SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect);
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)

1
include/effects/SkBlurImageFilter.h
View File

@ -17,6 +17,7 @@ public:
SkScalar sigmaY,
SkImageFilter* input = NULL,
const CropRect* cropRect = NULL);
virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBlurImageFilter)

4
include/effects/SkDisplacementMapEffect.h
View File

@ -37,6 +37,8 @@ public:
const SkMatrix& ctm,
SkBitmap* dst,
SkIPoint* offset) SK_OVERRIDE;
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
#if SK_SUPPORT_GPU
virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm,
@ -54,6 +56,8 @@ private:
typedef SkImageFilter INHERITED;
SkImageFilter* getDisplacementInput() { return getInput(0); }
SkImageFilter* getColorInput() { return getInput(1); }
const SkImageFilter* getDisplacementInput() const { return getInput(0); }
const SkImageFilter* getColorInput() const { return getInput(1); }
};
#endif

1
include/effects/SkDropShadowImageFilter.h
View File

@ -13,6 +13,7 @@ class SK_API SkDropShadowImageFilter : public SkImageFilter {
public:
SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigma, SkColor, SkImageFilter* input = NULL);
SkDropShadowImageFilter(SkScalar dx, SkScalar dy, SkScalar sigmaX, SkScalar sigmaY, SkColor, SkImageFilter* input = NULL, const CropRect* cropRect = NULL);
virtual void computeFastBounds(const SkRect&, SkRect*) const SK_OVERRIDE;
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDropShadowImageFilter)
protected:

1
include/effects/SkMorphologyImageFilter.h
View File

@ -16,6 +16,7 @@
class SK_API SkMorphologyImageFilter : public SkImageFilter {
public:
SkMorphologyImageFilter(int radiusX, int radiusY, SkImageFilter* input, const CropRect* cropRect);
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
/**
* All morphology procs have the same signature: src is the source buffer, dst the

1
include/effects/SkOffsetImageFilter.h
View File

@ -17,6 +17,7 @@ class SK_API SkOffsetImageFilter : public SkImageFilter {
public:
SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input = NULL,
const CropRect* cropRect = NULL);
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkOffsetImageFilter)
protected:

22
src/core/SkImageFilter.cpp
View File

@ -111,6 +111,28 @@ bool SkImageFilter::filterBounds(const SkIRect& src, const SkMatrix& ctm,
return this->onFilterBounds(src, ctm, dst);
}
void SkImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (0 == fInputCount) {
*dst = src;
return;
}
if (this->getInput(0)) {
this->getInput(0)->computeFastBounds(src, dst);
} else {
*dst = src;
}
for (int i = 1; i < fInputCount; i++) {
SkImageFilter* input = this->getInput(i);
if (input) {
SkRect bounds;
input->computeFastBounds(src, &bounds);
dst->join(bounds);
} else {
dst->join(src);
}
}
}
bool SkImageFilter::onFilterImage(Proxy*, const SkBitmap&, const SkMatrix&,
SkBitmap*, SkIPoint*) {
return false;

4
src/core/SkPaint.cpp
View File

@ -2288,6 +2288,10 @@ const SkRect& SkPaint::doComputeFastBounds(const SkRect& origSrc,
this->getMaskFilter()->computeFastBounds(*storage, storage);
}
if (this->getImageFilter()) {
this->getImageFilter()->computeFastBounds(*storage, storage);
}
return *storage;
}

4
src/effects/SkBitmapSource.cpp
View File

@ -78,3 +78,7 @@ bool SkBitmapSource::onFilterImage(Proxy* proxy, const SkBitmap&, const SkMatrix
offset->fY = dstIRect.fTop;
return true;
}
void SkBitmapSource::computeFastBounds(const SkRect&, SkRect* dst) const {
*dst = fDstRect;
}

11
src/effects/SkBlurImageFilter.cpp
View File

@ -224,6 +224,17 @@ bool SkBlurImageFilter::onFilterImage(Proxy* proxy,
return true;
}
void SkBlurImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (getInput(0)) {
getInput(0)->computeFastBounds(src, dst);
} else {
*dst = src;
}
dst->outset(SkScalarMul(fSigma.width(), SkIntToScalar(3)),
SkScalarMul(fSigma.height(), SkIntToScalar(3)));
}
bool SkBlurImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm,
SkBitmap* result, SkIPoint* offset) {
#if SK_SUPPORT_GPU

8
src/effects/SkDisplacementMapEffect.cpp
View File

@ -246,6 +246,14 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
return true;
}
void SkDisplacementMapEffect::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (getColorInput()) {
getColorInput()->computeFastBounds(src, dst);
} else {
*dst = src;
}
}
///////////////////////////////////////////////////////////////////////////////
#if SK_SUPPORT_GPU

15
src/effects/SkDropShadowImageFilter.cpp
View File

@ -95,3 +95,18 @@ bool SkDropShadowImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source
offset->fY = bounds.fTop;
return true;
}
void SkDropShadowImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (getInput(0)) {
getInput(0)->computeFastBounds(src, dst);
} else {
*dst = src;
}
SkRect shadowBounds = *dst;
shadowBounds.offset(fDx, fDy);
shadowBounds.outset(SkScalarMul(fSigmaX, SkIntToScalar(3)),
SkScalarMul(fSigmaY, SkIntToScalar(3)));
dst->join(shadowBounds);
}

9
src/effects/SkMorphologyImageFilter.cpp
View File

@ -239,6 +239,15 @@ bool SkDilateImageFilter::onFilterImage(Proxy* proxy,
return this->filterImageGeneric(dilateXProc, dilateYProc, proxy, source, ctm, dst, offset);
}
void SkMorphologyImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (getInput(0)) {
getInput(0)->computeFastBounds(src, dst);
} else {
*dst = src;
}
dst->outset(SkIntToScalar(fRadius.width()), SkIntToScalar(fRadius.height()));
}
#if SK_SUPPORT_GPU
///////////////////////////////////////////////////////////////////////////////

9
src/effects/SkOffsetImageFilter.cpp
View File

@ -65,6 +65,15 @@ bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
return true;
}
void SkOffsetImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
if (getInput(0)) {
getInput(0)->computeFastBounds(src, dst);
} else {
*dst = src;
}
dst->offset(fOffset.fX, fOffset.fY);
}
bool SkOffsetImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
SkIRect* dst) {
SkVector vec;