detect when we can filter bitmaps/images directly, w/o a tmp layer
visual bench run on Mac Pro
curr/maxrss loops min median mean max stddev samples config bench
100/100 MB 16 412µs 413µs 413µs 414µs 0% ▄▁▇▄▄▄▄█▄▃▅ gpu warmupbench
101/102 MB 32 547µs 548µs 611µs 1.24ms 34% █▁▁▁▁▁▁▁▁▁▁ gpu image-filter-sprite-draw-image
102/103 MB 32 547µs 548µs 721µs 1.23ms 41% █▁▇▁▁█▁▁▁▁▁ gpu image-filter-sprite-draw-bitmap
103/103 MB 64 546µs 546µs 546µs 547µs 0% ▆▄▂▁▇█▅▇▅▇▃ gpu image-filter-sprite-draw-sprite
Should have no effect on Chrome while SK_SUPPORT_LEGACY_LAYER_BITMAP_IMAGEFILTERS is defined (which it is in chrome)
BUG=skia:1073
Review URL: https://codereview.chromium.org/1491293002
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 1e49fe2..88dddf4 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -17,6 +17,8 @@
#include "SkDrawLooper.h"
#include "SkErrorInternals.h"
#include "SkImage.h"
+#include "SkImage_Base.h"
+#include "SkMatrixUtils.h"
#include "SkMetaData.h"
#include "SkNinePatchIter.h"
#include "SkPaintPriv.h"
@@ -592,6 +594,13 @@
////////// macros to place around the internal draw calls //////////////////
+#define LOOPER_BEGIN_DRAWBITMAP(paint, skipLayerForFilter, bounds) \
+ this->predrawNotify(); \
+ AutoDrawLooper looper(this, fProps, paint, skipLayerForFilter, bounds); \
+ while (looper.next(SkDrawFilter::kBitmap_Type)) { \
+ SkDrawIter iter(this);
+
+
#define LOOPER_BEGIN_DRAWDEVICE(paint, type) \
this->predrawNotify(); \
AutoDrawLooper looper(this, fProps, paint, true); \
@@ -1404,28 +1413,8 @@
LOOPER_BEGIN_DRAWDEVICE(*paint, SkDrawFilter::kBitmap_Type)
while (iter.next()) {
- paint = &looper.paint();
- SkImageFilter* filter = paint->getImageFilter();
- SkIPoint pos = { x - iter.getX(), y - iter.getY() };
- if (filter && !iter.fDevice->canHandleImageFilter(filter)) {
- SkImageFilter::DeviceProxy proxy(iter.fDevice);
- SkBitmap dst;
- SkIPoint offset = SkIPoint::Make(0, 0);
- SkMatrix matrix = *iter.fMatrix;
- matrix.postTranslate(SkIntToScalar(-pos.x()), SkIntToScalar(-pos.y()));
- const SkIRect clipBounds = bitmap.bounds();
- SkAutoTUnref<SkImageFilter::Cache> cache(iter.fDevice->getImageFilterCache());
- SkImageFilter::Context ctx(matrix, clipBounds, cache.get(),
- SkImageFilter::kApprox_SizeConstraint);
- if (filter->filterImage(&proxy, bitmap, ctx, &dst, &offset)) {
- SkPaint tmpUnfiltered(*paint);
- tmpUnfiltered.setImageFilter(nullptr);
- iter.fDevice->drawSprite(iter, dst, pos.x() + offset.x(), pos.y() + offset.y(),
- tmpUnfiltered);
- }
- } else {
- iter.fDevice->drawSprite(iter, bitmap, pos.x(), pos.y(), *paint);
- }
+ const SkIPoint pos = { x - iter.getX(), y - iter.getY() };
+ iter.fDevice->drawBitmapAsSprite(iter, bitmap, pos.x(), pos.y(), looper.paint());
}
LOOPER_END
}
@@ -2197,6 +2186,32 @@
LOOPER_END
}
+bool SkCanvas::canDrawBitmapAsSprite(SkScalar x, SkScalar y, int w, int h, const SkPaint& paint) {
+#ifdef SK_SUPPORT_LEGACY_LAYER_BITMAP_IMAGEFILTERS
+ return false;
+#endif
+
+ if (!paint.getImageFilter()) {
+ return false;
+ }
+
+ const SkMatrix& ctm = this->getTotalMatrix();
+ const unsigned kSubpixelBits = 0; // matching SkDraw::drawBitmap()
+ if (!SkTreatAsSprite(ctm, w, h, kSubpixelBits)) {
+ return false;
+ }
+
+ // Currently we can only use the filterSprite code if we are clipped to the bitmap's bounds.
+ // Once we can filter and the filter will return a result larger than itself, we should be
+ // able to remove this constraint.
+ // skbug.com/4526
+ //
+ SkPoint pt;
+ ctm.mapXY(x, y, &pt);
+ SkIRect ir = SkIRect::MakeXYWH(SkScalarRoundToInt(pt.x()), SkScalarRoundToInt(pt.y()), w, h);
+ return ir.contains(fMCRec->fRasterClip.getBounds());
+}
+
void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
TRACE_EVENT0("disabled-by-default-skia", "SkCanvas::drawImage()");
SkRect bounds = SkRect::MakeXYWH(x, y,
@@ -2215,11 +2230,25 @@
if (nullptr == paint) {
paint = lazy.init();
}
-
- LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, &bounds)
-
+
+ const bool drawAsSprite = this->canDrawBitmapAsSprite(x, y, image->width(), image->height(),
+ *paint);
+ LOOPER_BEGIN_DRAWBITMAP(*paint, drawAsSprite, &bounds)
+
while (iter.next()) {
- iter.fDevice->drawImage(iter, image, x, y, looper.paint());
+ const SkPaint& pnt = looper.paint();
+ if (drawAsSprite && pnt.getImageFilter()) {
+ SkBitmap bitmap;
+ if (as_IB(image)->asBitmapForImageFilters(&bitmap)) {
+ SkPoint pt;
+ iter.fMatrix->mapXY(x, y, &pt);
+ iter.fDevice->drawBitmapAsSprite(iter, bitmap,
+ SkScalarRoundToInt(pt.fX),
+ SkScalarRoundToInt(pt.fY), pnt);
+ }
+ } else {
+ iter.fDevice->drawImage(iter, image, x, y, pnt);
+ }
}
LOOPER_END
@@ -2281,12 +2310,23 @@
bounds = &storage;
}
- LOOPER_BEGIN(*paint, SkDrawFilter::kBitmap_Type, bounds)
+ const bool drawAsSprite = bounds && this->canDrawBitmapAsSprite(x, y, bitmap.width(),
+ bitmap.height(), *paint);
+ LOOPER_BEGIN_DRAWBITMAP(*paint, drawAsSprite, bounds)
while (iter.next()) {
- iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
+ const SkPaint& pnt = looper.paint();
+ if (drawAsSprite && pnt.getImageFilter()) {
+ SkPoint pt;
+ iter.fMatrix->mapXY(x, y, &pt);
+ iter.fDevice->drawBitmapAsSprite(iter, bitmap,
+ SkScalarRoundToInt(pt.fX),
+ SkScalarRoundToInt(pt.fY), pnt);
+ } else {
+ iter.fDevice->drawBitmap(iter, bitmap, matrix, looper.paint());
+ }
}
-
+
LOOPER_END
}
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index 34c171d..cf4a279 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -402,6 +402,29 @@
//////////////////////////////////////////////////////////////////////////////////////////
+void SkBaseDevice::drawBitmapAsSprite(const SkDraw& draw, const SkBitmap& bitmap, int x, int y,
+ const SkPaint& paint) {
+ SkImageFilter* filter = paint.getImageFilter();
+ if (filter && !this->canHandleImageFilter(filter)) {
+ SkImageFilter::DeviceProxy proxy(this);
+ SkBitmap dst;
+ SkIPoint offset = SkIPoint::Make(0, 0);
+ SkMatrix matrix = *draw.fMatrix;
+ matrix.postTranslate(SkIntToScalar(-x), SkIntToScalar(-y));
+ const SkIRect clipBounds = bitmap.bounds();
+ SkAutoTUnref<SkImageFilter::Cache> cache(this->getImageFilterCache());
+ SkImageFilter::Context ctx(matrix, clipBounds, cache.get(),
+ SkImageFilter::kApprox_SizeConstraint);
+ if (filter->filterImage(&proxy, bitmap, ctx, &dst, &offset)) {
+ SkPaint tmpUnfiltered(paint);
+ tmpUnfiltered.setImageFilter(nullptr);
+ this->drawSprite(draw, dst, x + offset.x(), y + offset.y(), tmpUnfiltered);
+ }
+ } else {
+ this->drawSprite(draw, bitmap, x, y, paint);
+ }
+}
+
uint32_t SkBaseDevice::filterTextFlags(const SkPaint& paint) const {
uint32_t flags = paint.getFlags();
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index c91430e..5cb6a48 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -55,6 +55,12 @@
virtual bool onIsLazyGenerated() const { return false; }
+ // Return a bitmap suitable for passing to image-filters
+ // For now, that means wrapping textures into SkGrPixelRefs...
+ virtual bool asBitmapForImageFilters(SkBitmap* bitmap) const {
+ return this->getROPixels(bitmap, kAllow_CachingHint);
+ }
+
// Call when this image is part of the key to a resourcecache entry. This allows the cache
// to know automatically those entries can be purged when this SkImage deleted.
void notifyAddedToCache() const {
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 346f798..55a82bb 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -5,16 +5,18 @@
* found in the LICENSE file.
*/
-#include "SkBitmapCache.h"
-#include "SkImage_Gpu.h"
#include "GrCaps.h"
#include "GrContext.h"
#include "GrDrawContext.h"
#include "GrTextureParamsAdjuster.h"
#include "effects/GrYUVtoRGBEffect.h"
#include "SkCanvas.h"
+#include "SkBitmapCache.h"
#include "SkGpuDevice.h"
+#include "SkGrPixelRef.h"
#include "SkGrPriv.h"
+#include "SkImageFilter.h"
+#include "SkImage_Gpu.h"
#include "SkPixelRef.h"
SkImage_Gpu::SkImage_Gpu(int w, int h, uint32_t uniqueID, SkAlphaType at, GrTexture* tex,
@@ -69,6 +71,13 @@
return true;
}
+bool SkImage_Gpu::asBitmapForImageFilters(SkBitmap* bitmap) const {
+ bitmap->setInfo(make_info(this->width(), this->height(), this->isOpaque()));
+ bitmap->setPixelRef(new SkGrPixelRef(bitmap->info(), fTexture))->unref();
+ bitmap->pixelRef()->setImmutableWithID(this->uniqueID());
+ return true;
+}
+
class GpuImage_GrTextureAdjuster : public GrTextureAdjuster {
public:
GpuImage_GrTextureAdjuster(const SkImage_Gpu* image)
@@ -166,9 +175,6 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkGrPixelRef.h"
-#include "SkImageFilter.h"
-
class SkGpuImageFilterProxy : public SkImageFilter::Proxy {
GrContext* fCtx;
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index ff3b12e..bd8abd2 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -50,6 +50,8 @@
return SkSurface::NewRenderTarget(fTexture->getContext(), SkSurface::kNo_Budgeted, info);
}
+ bool asBitmapForImageFilters(SkBitmap* bitmap) const override;
+
private:
SkAutoTUnref<GrTexture> fTexture;
const SkAlphaType fAlphaType;