diff options
author | reed <reed@google.com> | 2016-07-20 16:13:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-20 16:13:32 -0700 |
commit | ad7604b4a7ab8d4f8deb061a309b582b12a9bba9 (patch) | |
tree | 8c50f3bd3dd82efe942365d16ccbfbec73eb1c9f /src/core | |
parent | 3fb87201a104c9445fca341756a153f7b147c2a5 (diff) |
Have MakeFromImage fission the SkImage into a raster or a texture (patchset #1 id:1 of https://codereview.chromium.org/2167813002/ )"
This reverts commit 3fb87201a104c9445fca341756a153f7b147c2a5.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164073004
TBR=robertphilips@google.com
Review-Url: https://codereview.chromium.org/2164073004
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkSpecialImage.cpp | 161 |
1 files changed, 23 insertions, 138 deletions
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp index 4a3e46e117..19194bd405 100644 --- a/src/core/SkSpecialImage.cpp +++ b/src/core/SkSpecialImage.cpp @@ -4,20 +4,26 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file */ + #include "SkSpecialImage.h" +#include "SkBitmap.h" +#include "SkImage.h" +#include "SkBitmapCache.h" +#include "SkCanvas.h" +#include "SkImage_Base.h" +#include "SkSpecialSurface.h" +#include "SkSurfacePriv.h" +#include "SkPixelRef.h" #if SK_SUPPORT_GPU +#include "GrContext.h" #include "GrTexture.h" #include "GrTextureParams.h" #include "SkGr.h" +#include "SkGrPixelRef.h" +#include "SkGrPriv.h" #endif -#include "SkBitmapCache.h" -#include "SkCanvas.h" -#include "SkImage_Base.h" -#include "SkSpecialSurface.h" -#include "SkSurfacePriv.h" - // Currently the raster imagefilters can only handle certain imageinfos. Call this to know if // a given info is supported. static bool valid_for_imagefilters(const SkImageInfo& info) { @@ -160,131 +166,6 @@ sk_sp<SkImage> SkSpecialImage::makeTightSubset(const SkIRect& subset) const { return as_SIB(this)->onMakeTightSubset(subset); } -#if SK_SUPPORT_GPU -#include "SkGr.h" -#include "SkGrPixelRef.h" -#endif - -/////////////////////////////////////////////////////////////////////////////// -#include "SkImage.h" -#if SK_SUPPORT_GPU -#include "GrContext.h" -#include "SkGrPriv.h" -#endif - -class SkSpecialImage_Image : public SkSpecialImage_Base { -public: - SkSpecialImage_Image(const SkIRect& subset, - sk_sp<SkImage> image, - const SkSurfaceProps* props) - : INHERITED(subset, image->uniqueID(), props) - , fImage(image) { - } - - ~SkSpecialImage_Image() override { } - - bool isOpaque() const override { return fImage->isOpaque(); } - - size_t getSize() const override { -#if SK_SUPPORT_GPU - if (GrTexture* texture = as_IB(fImage.get())->peekTexture()) { - return texture->gpuMemorySize(); - } else -#endif - { - SkPixmap pm; - if (fImage->peekPixels(&pm)) { - return pm.height() * pm.rowBytes(); - } - } - return 0; - } - - void onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const override { - SkRect dst = SkRect::MakeXYWH(x, y, this->subset().width(), this->subset().height()); - - canvas->drawImageRect(fImage.get(), this->subset(), - dst, paint, SkCanvas::kStrict_SrcRectConstraint); - } - - bool onGetROPixels(SkBitmap* bm) const override { - return as_IB(fImage)->getROPixels(bm); - } - - GrTexture* onPeekTexture() const override { return as_IB(fImage)->peekTexture(); } - -#if SK_SUPPORT_GPU - sk_sp<GrTexture> onAsTextureRef(GrContext* context) const override { - return sk_sp<GrTexture>(as_IB(fImage)->asTextureRef(context, - GrTextureParams::ClampNoFilter(), - SkSourceGammaTreatment::kRespect)); - } -#endif - - bool getBitmapDeprecated(SkBitmap* result) const override { -#if SK_SUPPORT_GPU - if (GrTexture* texture = as_IB(fImage.get())->peekTexture()) { - const SkImageInfo info = GrMakeInfoFromTexture(texture, - fImage->width(), fImage->height(), - fImage->isOpaque()); - if (!result->setInfo(info)) { - return false; - } - - result->setPixelRef(new SkGrPixelRef(info, texture))->unref(); - return true; - } -#endif - - return as_IB(fImage.get())->asBitmapForImageFilters(result); - } - - sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const override { -#if SK_SUPPORT_GPU - GrTexture* texture = as_IB(fImage.get())->peekTexture(); - if (texture) { - GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *texture->getContext()->caps()); - - return SkSpecialSurface::MakeRenderTarget(texture->getContext(), - info.width(), - info.height(), - config); - } -#endif - return SkSpecialSurface::MakeRaster(info, nullptr); - } - - sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const override { - sk_sp<SkImage> subsetImg(fImage->makeSubset(subset)); - if (!subsetImg) { - return nullptr; - } - - return SkSpecialImage::MakeFromImage(SkIRect::MakeWH(subset.width(), subset.height()), - subsetImg, - &this->props()); - } - - sk_sp<SkImage> onMakeTightSubset(const SkIRect& subset) const override { - return fImage->makeSubset(subset); - } - - sk_sp<SkSurface> onMakeTightSurface(const SkImageInfo& info) const override { -#if SK_SUPPORT_GPU - GrTexture* texture = as_IB(fImage.get())->peekTexture(); - if (texture) { - return SkSurface::MakeRenderTarget(texture->getContext(), SkBudgeted::kYes, info); - } -#endif - return SkSurface::MakeRaster(info, nullptr); - } - -private: - sk_sp<SkImage> fImage; - - typedef SkSpecialImage_Base INHERITED; -}; - #ifdef SK_DEBUG static bool rect_fits(const SkIRect& rect, int width, int height) { if (0 == width && 0 == height) { @@ -304,17 +185,21 @@ sk_sp<SkSpecialImage> SkSpecialImage::MakeFromImage(const SkIRect& subset, const SkSurfaceProps* props) { SkASSERT(rect_fits(subset, image->width(), image->height())); - if (valid_for_imagefilters(as_IB(image.get())->onImageInfo())) { - return sk_make_sp<SkSpecialImage_Image>(subset, image, props); - } else { - return nullptr; +#if SK_SUPPORT_GPU + if (GrTexture* texture = as_IB(image)->peekTexture()) { + return MakeFromGpu(subset, image->uniqueID(), sk_ref_sp(texture), props); + } else +#endif + { + SkBitmap bm; + if (as_IB(image)->getROPixels(&bm)) { + return MakeFromRaster(subset, bm, props); + } } + return nullptr; } /////////////////////////////////////////////////////////////////////////////// -#include "SkBitmap.h" -#include "SkImageInfo.h" -#include "SkPixelRef.h" class SkSpecialImage_Raster : public SkSpecialImage_Base { public: |