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

Add SkSpecialImage-based methods to SkImageFilter

Browse Source 
This is calved off of https://codereview.chromium.org/1695823002/ (Get OffsetImageFilter really working with SkSpecialImages)

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1757983002

Review URL: https://codereview.chromium.org/1757983002
This commit is contained in:
robertphillips 2016-03-07 04:51:10 -08:00 committed by Commit bot
parent a5ab9ec295
commit eaf086e3ce
2 changed files with 110 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/core/SkImageFilter.h
View File

@ -151,6 +151,8 @@ public:
bool filterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const;
SkSpecialImage* filterImage(SkSpecialImage* src, const Context&, SkIPoint* offset) const;
enum MapDirection {
kForward_MapDirection,
kReverse_MapDirection
@ -263,6 +265,11 @@ public:
SkFilterQuality,
SkImageFilter* input = NULL);
SkSpecialImage* filterInput(int index,
SkSpecialImage* src,
const Context&,
SkIPoint* offset) const;
#if SK_SUPPORT_GPU
// Helper function which invokes GPU filter processing on the
// input at the specified "index". If the input is null, it leaves
@ -348,6 +355,9 @@ protected:
virtual bool onFilterImageDeprecated(Proxy*, const SkBitmap& src, const Context&,
SkBitmap* result, SkIPoint* offset) const;
virtual SkSpecialImage* onFilterImage(SkSpecialImage* src, const Context&,
SkIPoint* offset) const;
/**
* This function recurses into its inputs with the given clip rect (first
* argument), calls filterBounds() with the given map direction on each,
@ -417,6 +427,9 @@ protected:
bool applyCropRectDeprecated(const Context&, Proxy* proxy, const SkBitmap& src,
SkIPoint* srcOffset, SkIRect* bounds, SkBitmap* result) const;
SkSpecialImage* applyCropRect(const Context&, SkSpecialImage* src, SkIPoint* srcOffset,
SkIRect* bounds) const;
/**
* Returns true if the filter can be expressed a single-pass
* GrProcessor, used to process this filter on the GPU, or false if

97
src/core/SkImageFilter.cpp
View File

@ -18,6 +18,7 @@
#include "SkReadBuffer.h"
#include "SkRect.h"
#include "SkSpecialImage.h"
#include "SkSpecialSurface.h"
#include "SkTDynamicHash.h"
#include "SkTInternalLList.h"
#include "SkValidationUtils.h"
@ -213,6 +214,28 @@ void SkImageFilter::flatten(SkWriteBuffer& buffer) const {
buffer.writeUInt(fCropRect.flags());
}
SkSpecialImage* SkImageFilter::filterImage(SkSpecialImage* src, const Context& context,
SkIPoint* offset) const {
SkASSERT(src && offset);
uint32_t srcGenID = fUsesSrcInput ? src->uniqueID() : 0;
const SkIRect srcSubset = fUsesSrcInput ? src->subset() : SkIRect::MakeWH(0, 0);
Cache::Key key(fUniqueID, context.ctm(), context.clipBounds(), srcGenID, srcSubset);
if (context.cache()) {
SkSpecialImage* result = context.cache()->get(key, offset);
if (result) {
return SkRef(result);
}
}
SkSpecialImage* result = this->onFilterImage(src, context, offset);
if (result && context.cache()) {
context.cache()->set(key, result, *offset);
}
return result;
}
bool SkImageFilter::filterImageDeprecated(Proxy* proxy, const SkBitmap& src,
const Context& context,
SkBitmap* result, SkIPoint* offset) const {
@ -307,6 +330,21 @@ bool SkImageFilter::onFilterImageDeprecated(Proxy*, const SkBitmap&, const Conte
return false;
}
SkSpecialImage* SkImageFilter::onFilterImage(SkSpecialImage* src, const Context& ctx,
SkIPoint* offset) const {
SkBitmap srcBM, resultBM;
if (!src->internal_getBM(&srcBM)) {
return nullptr;
}
if (!this->filterImageDeprecated(src->internal_getProxy(), srcBM, ctx, &resultBM, offset)) {
return nullptr;
}
return SkSpecialImage::internal_fromBM(src->internal_getProxy(), resultBM);
}
bool SkImageFilter::canFilterImageGPU() const {
return this->asFragmentProcessor(nullptr, nullptr, SkMatrix::I(), SkIRect());
}
@ -419,6 +457,53 @@ bool SkImageFilter::applyCropRectDeprecated(const Context& ctx, Proxy* proxy, co
}
}
// Return a larger (newWidth x newHeight) copy of 'src' with black padding
// around it.
static SkSpecialImage* pad_image(SkSpecialImage* src,
int newWidth, int newHeight, int offX, int offY) {
SkImageInfo info = SkImageInfo::MakeN32Premul(newWidth, newHeight);
SkAutoTUnref<SkSpecialSurface> surf(src->newSurface(info));
if (!surf) {
return nullptr;
}
SkCanvas* canvas = surf->getCanvas();
SkASSERT(canvas);
canvas->clear(0x0);
src->draw(canvas, offX, offY, nullptr);
return surf->newImageSnapshot();
}
SkSpecialImage* SkImageFilter::applyCropRect(const Context& ctx,
SkSpecialImage* src,
SkIPoint* srcOffset,
SkIRect* bounds) const {
SkIRect srcBounds;
srcBounds = SkIRect::MakeXYWH(srcOffset->fX, srcOffset->fY, src->width(), src->height());
SkIRect dstBounds;
this->onFilterNodeBounds(srcBounds, ctx.ctm(), &dstBounds, kForward_MapDirection);
fCropRect.applyTo(dstBounds, ctx.ctm(), bounds);
if (!bounds->intersect(ctx.clipBounds())) {
return nullptr;
}
if (srcBounds.contains(*bounds)) {
return SkRef(src);
} else {
SkSpecialImage* img = pad_image(src,
bounds->width(), bounds->height(),
srcOffset->x() - bounds->x(),
srcOffset->y() - bounds->y());
*srcOffset = SkIPoint::Make(bounds->x(), bounds->y());
return img;
}
}
bool SkImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
SkIRect* dst, MapDirection direction) const {
if (fInputCount < 1) {
@ -477,6 +562,18 @@ SkImageFilter* SkImageFilter::newWithLocalMatrix(const SkMatrix& matrix) const {
return SkLocalMatrixImageFilter::Create(matrix, const_cast<SkImageFilter*>(this));
}
SkSpecialImage* SkImageFilter::filterInput(int index,
SkSpecialImage* src,
const Context& ctx,
SkIPoint* offset) const {
SkImageFilter* input = this->getInput(index);
if (!input) {
return SkRef(src);
}
return input->filterImage(src, this->mapContext(ctx), offset);
}
#if SK_SUPPORT_GPU
bool SkImageFilter::filterInputGPUDeprecated(int index, SkImageFilter::Proxy* proxy,