pin as texture api
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2241353002
Review-Url: https://codereview.chromium.org/2241353002
diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
index 9febeaa..b8c8964 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -511,3 +511,17 @@
const SkIRect* subset) {
return SkImage::MakeFromEncoded(SkData::MakeWithCopy(data, length), subset);
}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SkImage_pinAsTexture(const SkImage* image, GrContext* ctx) {
+ SkASSERT(image);
+ SkASSERT(ctx);
+ as_IB(image)->onPinAsTexture(ctx);
+}
+
+void SkImage_unpinAsTexture(const SkImage* image, GrContext* ctx) {
+ SkASSERT(image);
+ SkASSERT(ctx);
+ as_IB(image)->onUnpinAsTexture(ctx);
+}
diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 1cfb7da..09971c1 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -8,6 +8,7 @@
#ifndef SkImage_Base_DEFINED
#define SkImage_Base_DEFINED
+#include "GrTexture.h"
#include "SkAtomics.h"
#include "SkImage.h"
#include "SkSurface.h"
@@ -40,6 +41,7 @@
int srcX, int srcY, CachingHint) const;
virtual GrTexture* peekTexture() const { return nullptr; }
+ virtual sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const { return nullptr; }
virtual SkImageCacherator* peekCacherator() const { return nullptr; }
// return a read-only copy of the pixels. We promise to not modify them,
@@ -69,6 +71,9 @@
fAddedToCache.store(true);
}
+ virtual void onPinAsTexture(GrContext*) const {}
+ virtual void onUnpinAsTexture(GrContext*) const {}
+
private:
// Set true by caches when they cache content that's derived from the current pixels.
mutable SkAtomic<bool> fAddedToCache;
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 44bb71c..76f19bc 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -83,8 +83,9 @@
GrTexture* SkImage_Gpu::asTextureRef(GrContext* ctx, const GrTextureParams& params,
SkSourceGammaTreatment gammaTreatment) const {
- return GrImageTextureAdjuster(as_IB(this)).refTextureSafeForParams(params, gammaTreatment,
- nullptr);
+ GrTextureAdjuster adjuster(this->peekTexture(), this->bounds(), this->uniqueID(),
+ this->onImageInfo().colorSpace());
+ return adjuster.refTextureSafeForParams(params, gammaTreatment, nullptr);
}
bool SkImage_Gpu::isOpaque() const {
diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h
index 5faaa75..44949a1 100644
--- a/src/image/SkImage_Gpu.h
+++ b/src/image/SkImage_Gpu.h
@@ -43,6 +43,10 @@
sk_sp<SkImage> onMakeSubset(const SkIRect&) const override;
GrTexture* peekTexture() const override { return fTexture; }
+ sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const override {
+ *uniqueID = this->uniqueID();
+ return sk_ref_sp(fTexture.get());
+ }
bool isOpaque() const override;
bool onReadPixels(const SkImageInfo&, void* dstPixels, size_t dstRowBytes,
int srcX, int srcY, CachingHint) const override;
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index 67d521e..abdecb9 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -115,9 +115,21 @@
return fBitmap.pixelRef() && fBitmap.pixelRef()->isLazyGenerated();
}
+#if SK_SUPPORT_GPU
+ sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const override;
+ void onPinAsTexture(GrContext*) const override;
+ void onUnpinAsTexture(GrContext*) const override;
+#endif
+
private:
SkBitmap fBitmap;
+#if SK_SUPPORT_GPU
+ mutable sk_sp<GrTexture> fPinnedTexture;
+ mutable int32_t fPinnedCount = 0;
+ mutable uint32_t fPinnedUniqueID = 0;
+#endif
+
typedef SkImage_Base INHERITED;
};
@@ -149,7 +161,11 @@
SkASSERT(fBitmap.isImmutable());
}
-SkImage_Raster::~SkImage_Raster() {}
+SkImage_Raster::~SkImage_Raster() {
+#if SK_SUPPORT_GPU
+ SkASSERT(nullptr == fPinnedTexture.get()); // want the caller to have manually unpinned
+#endif
+}
bool SkImage_Raster::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
int srcX, int srcY, CachingHint) const {
@@ -178,6 +194,8 @@
return true;
}
+#include "GrImageIDTextureAdjuster.h"
+
GrTexture* SkImage_Raster::asTextureRef(GrContext* ctx, const GrTextureParams& params,
SkSourceGammaTreatment gammaTreatment) const {
#if SK_SUPPORT_GPU
@@ -185,12 +203,64 @@
return nullptr;
}
+ uint32_t uniqueID;
+ sk_sp<GrTexture> tex = this->refPinnedTexture(&uniqueID);
+ if (tex) {
+ GrTextureAdjuster adjuster(fPinnedTexture.get(), fBitmap.bounds(),
+ fPinnedUniqueID, fBitmap.colorSpace());
+ return adjuster.refTextureSafeForParams(params, gammaTreatment, nullptr);
+ }
+
return GrRefCachedBitmapTexture(ctx, fBitmap, params, gammaTreatment);
#endif
return nullptr;
}
+#if SK_SUPPORT_GPU
+
+sk_sp<GrTexture> SkImage_Raster::refPinnedTexture(uint32_t* uniqueID) const {
+ if (fPinnedTexture) {
+ SkASSERT(fPinnedCount > 0);
+ SkASSERT(fPinnedUniqueID != 0);
+ *uniqueID = fPinnedUniqueID;
+ return fPinnedTexture;
+ }
+ return nullptr;
+}
+
+void SkImage_Raster::onPinAsTexture(GrContext* ctx) const {
+ if (fPinnedTexture) {
+ SkASSERT(fPinnedCount > 0);
+ SkASSERT(fPinnedUniqueID != 0);
+ SkASSERT(fPinnedTexture->getContext() == ctx);
+ } else {
+ SkASSERT(fPinnedCount == 0);
+ SkASSERT(fPinnedUniqueID == 0);
+ fPinnedTexture.reset(GrRefCachedBitmapTexture(ctx, fBitmap,
+ GrTextureParams::ClampNoFilter(),
+ SkSourceGammaTreatment::kRespect));
+ fPinnedUniqueID = fBitmap.getGenerationID();
+ }
+ // Note: we always increment, even if we failed to create the pinned texture
+ ++fPinnedCount;
+}
+
+void SkImage_Raster::onUnpinAsTexture(GrContext* ctx) const {
+ // Note: we always decrement, even if fPinnedTexture is null
+ SkASSERT(fPinnedCount > 0);
+ SkASSERT(fPinnedUniqueID != 0);
+ if (fPinnedTexture) {
+ SkASSERT(fPinnedTexture->getContext() == ctx);
+ }
+
+ if (0 == --fPinnedCount) {
+ fPinnedTexture.reset(nullptr);
+ fPinnedUniqueID = 0;
+ }
+}
+#endif
+
sk_sp<SkImage> SkImage_Raster::onMakeSubset(const SkIRect& subset) const {
// TODO : could consider heurist of sharing pixels, if subset is pretty close to complete