aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/SkMultiPictureDraw.cpp3
-rw-r--r--src/gpu/GrLayerCache.cpp37
-rw-r--r--src/gpu/GrLayerCache.h9
-rw-r--r--src/gpu/GrLayerHoister.cpp11
-rw-r--r--src/gpu/GrLayerHoister.h6
5 files changed, 18 insertions, 48 deletions
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp
index 7d6639b4df..5fe3c0ea52 100644
--- a/src/core/SkMultiPictureDraw.cpp
+++ b/src/core/SkMultiPictureDraw.cpp
@@ -146,9 +146,6 @@ void SkMultiPictureDraw::draw() {
if (NULL != context) {
GrLayerHoister::UnlockLayers(context, atlasedNeedRendering);
GrLayerHoister::UnlockLayers(context, atlasedRecycled);
-#if !GR_CACHE_HOISTED_LAYERS
- GrLayerHoister::PurgeCache(context);
-#endif
}
#endif
diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp
index 22788b52af..d897c9dea5 100644
--- a/src/gpu/GrLayerCache.cpp
+++ b/src/gpu/GrLayerCache.cpp
@@ -81,6 +81,7 @@ private:
GrLayerCache::GrLayerCache(GrContext* context)
: fContext(context) {
+ this->initAtlas();
memset(fPlotLocks, 0, sizeof(fPlotLocks));
}
@@ -119,6 +120,11 @@ void GrLayerCache::freeAll() {
// The atlas only lets go of its texture when the atlas is deleted.
fAtlas.free();
+ // GrLayerCache always assumes an atlas exists so recreate it. The atlas
+ // lazily allocates a replacement texture so reallocating a new
+ // atlas here won't disrupt a GrContext::abandonContext or freeGpuResources.
+ // TODO: Make GrLayerCache lazily allocate the atlas manager?
+ this->initAtlas();
}
GrCachedLayer* GrLayerCache::createLayer(uint32_t pictureID,
@@ -164,7 +170,6 @@ bool GrLayerCache::tryToAtlas(GrCachedLayer* layer,
if (layer->locked()) {
// This layer is already locked
- SkASSERT(fAtlas);
SkASSERT(layer->isAtlased());
SkASSERT(layer->rect().width() == desc.fWidth);
SkASSERT(layer->rect().height() == desc.fHeight);
@@ -173,19 +178,12 @@ bool GrLayerCache::tryToAtlas(GrCachedLayer* layer,
}
if (layer->isAtlased()) {
- SkASSERT(fAtlas);
// Hooray it is still in the atlas - make sure it stays there
layer->setLocked(true);
this->incPlotLock(layer->plot()->id());
*needsRendering = false;
return true;
} else {
- if (!fAtlas) {
- this->initAtlas();
- if (!fAtlas) {
- return false;
- }
- }
// Not in the atlas - will it fit?
GrPictureInfo* pictInfo = fPictureHash.find(layer->pictureID());
if (NULL == pictInfo) {
@@ -258,7 +256,7 @@ void GrLayerCache::unlock(GrCachedLayer* layer) {
this->decPlotLock(plotID);
// At this point we could aggressively clear out un-locked plots but
// by delaying we may be able to reuse some of the atlased layers later.
-#if !GR_CACHE_HOISTED_LAYERS
+#if DISABLE_CACHING
// This testing code aggressively removes the atlased layers. This
// can be used to separate the performance contribution of less
// render target pingponging from that due to the re-use of cached layers
@@ -357,7 +355,6 @@ void GrLayerCache::purge(uint32_t pictureID) {
bool GrLayerCache::purgePlot() {
SkDEBUGCODE(GrAutoValidateCache avc(this);)
- SkASSERT(fAtlas);
GrAtlas::PlotIter iter;
GrPlot* plot;
@@ -412,12 +409,7 @@ void GrLayerCache::purgePlot(GrPlot* plot) {
plot->resetRects();
}
-#if !GR_CACHE_HOISTED_LAYERS
void GrLayerCache::purgeAll() {
- if (!fAtlas) {
- return;
- }
-
GrAtlas::PlotIter iter;
GrPlot* plot;
for (plot = fAtlas->iterInit(&iter, GrAtlas::kLRUFirst_IterOrder);
@@ -427,10 +419,7 @@ void GrLayerCache::purgeAll() {
this->purgePlot(plot);
}
-
- fContext->discardRenderTarget(fAtlas->getTexture()->asRenderTarget());
}
-#endif
class GrPictureDeletionListener : public SkPicture::DeletionListener {
virtual void onDeletion(uint32_t pictureID) SK_OVERRIDE{
@@ -459,14 +448,12 @@ void GrLayerCache::processDeletedPictures() {
#ifdef SK_DEVELOPER
void GrLayerCache::writeLayersToDisk(const SkString& dirName) {
- if (fAtlas) {
- GrTexture* atlasTexture = fAtlas->getTexture();
- if (NULL != atlasTexture) {
- SkString fileName(dirName);
- fileName.append("\\atlas.png");
+ GrTexture* atlasTexture = fAtlas->getTexture();
+ if (NULL != atlasTexture) {
+ SkString fileName(dirName);
+ fileName.append("\\atlas.png");
- atlasTexture->surfacePriv().savePixels(fileName.c_str());
- }
+ atlasTexture->surfacePriv().savePixels(fileName.c_str());
}
SkTDynamicHash<GrCachedLayer, GrCachedLayer::Key>::Iter iter(&fLayerHash);
diff --git a/src/gpu/GrLayerCache.h b/src/gpu/GrLayerCache.h
index 632cd00540..c772332922 100644
--- a/src/gpu/GrLayerCache.h
+++ b/src/gpu/GrLayerCache.h
@@ -18,9 +18,6 @@
class SkPicture;
-// Set to 0 to disable caching of hoisted layers
-#define GR_CACHE_HOISTED_LAYERS 0
-
// The layer cache listens for these messages to purge picture-related resources.
struct GrPictureDeletedMessage {
uint32_t pictureID;
@@ -252,10 +249,6 @@ public:
return width <= kPlotWidth && height <= kPlotHeight;
}
-#if !GR_CACHE_HOISTED_LAYERS
- void purgeAll();
-#endif
-
private:
static const int kAtlasTextureWidth = 1024;
static const int kAtlasTextureHeight = 1024;
@@ -298,6 +291,8 @@ private:
const SkIRect& bounds, const SkMatrix& ctm,
const SkPaint* paint);
+ void purgeAll();
+
// Remove all the layers (and unlock any resources) associated with 'pictureID'
void purge(uint32_t pictureID);
diff --git a/src/gpu/GrLayerHoister.cpp b/src/gpu/GrLayerHoister.cpp
index 00576710cd..1f7ce419ae 100644
--- a/src/gpu/GrLayerHoister.cpp
+++ b/src/gpu/GrLayerHoister.cpp
@@ -314,16 +314,13 @@ void GrLayerHoister::UnlockLayers(GrContext* context,
layerCache->removeUse(layers[i].fLayer);
}
- SkDEBUGCODE(layerCache->validate();)
-}
-
-void GrLayerHoister::PurgeCache(GrContext* context) {
-#if !GR_CACHE_HOISTED_LAYERS
- GrLayerCache* layerCache = context->getLayerCache();
-
+#if DISABLE_CACHING
// This code completely clears out the atlas. It is required when
// caching is disabled so the atlas doesn't fill up and force more
// free floating layers
layerCache->purgeAll();
#endif
+
+ SkDEBUGCODE(layerCache->validate();)
}
+
diff --git a/src/gpu/GrLayerHoister.h b/src/gpu/GrLayerHoister.h
index c3a451df57..82dd967bb3 100644
--- a/src/gpu/GrLayerHoister.h
+++ b/src/gpu/GrLayerHoister.h
@@ -87,12 +87,6 @@ public:
@param layers Unneeded layers in the atlas
*/
static void UnlockLayers(GrContext* context, const SkTDArray<GrHoistedLayer>& layers);
-
- /** Forceably remove all cached layers and release the atlas. Useful for debugging and timing.
- This is only functional when GR_CACHE_HOISTED_LAYERS is set to 1 in GrLayerCache.h
- @param context Owner of the layer cache (and thus the layers)
- */
- static void PurgeCache(GrContext* context);
};
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 07:19:06 +0000