Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a137494 authored by Romain Guy's avatar Romain Guy
Browse files

Deleting objects on the wrong thread is a silly idea 

Bug #7195815

Turns out that multi-threading is hard.

Change-Id: Ib0b4bd6dc3caea27f7ced22cbb363bb955fe58ab
parent 1ab8a08a

libs/hwui/Layer.cpp

+6 −10
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <utils/Log.h>



#include "Layer.h"

#include "LayerRenderer.h"

#include "OpenGLRenderer.h"

#include "Caches.h"
@@ -46,15 +47,12 @@ Layer::~Layer() { 
    if (mesh) delete mesh;

    if (meshIndices) delete meshIndices;

    if (colorFilter) Caches::getInstance().resourceCache.decrementRefcount(colorFilter);

    if (fbo) Caches::getInstance().fboCache.put(fbo);

    deleteTexture();

}



void Layer::freeResourcesLocked() {

    if (colorFilter) {

        Caches::getInstance().resourceCache.decrementRefcountLocked(colorFilter);

        colorFilter = NULL;

    if (fbo) {

        LayerRenderer::flushLayer(this);

        Caches::getInstance().fboCache.put(fbo);

        fbo = 0;

    }

    deleteTexture();

}



void Layer::setPaint(SkPaint* paint) {
@@ -71,7 +69,5 @@ void Layer::setColorFilter(SkiaColorFilter* filter) { 
    }

}







}; // namespace uirenderer

}; // namespace android

libs/hwui/Layer.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct Layer { 
    Layer(const uint32_t layerWidth, const uint32_t layerHeight);

    ~Layer();



    void freeResourcesLocked();



    /**

     * Sets this layer's region to a rectangle. Computes the appropriate

     * texture coordinates.

libs/hwui/LayerRenderer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -299,13 +299,6 @@ void LayerRenderer::destroyLayer(Layer* layer) { 
        LAYER_RENDERER_LOGD("Recycling layer, %dx%d fbo = %d",

                layer->getWidth(), layer->getHeight(), layer->getFbo());



        GLuint fbo = layer->getFbo();

        if (fbo) {

            flushLayer(layer);

            Caches::getInstance().fboCache.put(fbo);

            layer->setFbo(0);

        }



        if (!Caches::getInstance().layerCache.put(layer)) {

            LAYER_RENDERER_LOGD("  Destroyed!");

            Caches::getInstance().resourceCache.decrementRefcount(layer);
@@ -322,7 +315,6 @@ void LayerRenderer::destroyLayer(Layer* layer) { 
void LayerRenderer::destroyLayerDeferred(Layer* layer) {

    if (layer) {

        LAYER_RENDERER_LOGD("Deferring layer destruction, fbo = %d", layer->getFbo());



        Caches::getInstance().deleteLayerDeferred(layer);

    }

}

libs/hwui/LayerRenderer.h

+2 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public: 
    ANDROID_API static void destroyLayerDeferred(Layer* layer);

    ANDROID_API static bool copyLayer(Layer* layer, SkBitmap* bitmap);



    static void flushLayer(Layer* layer);



protected:

    virtual bool hasLayer();

    virtual Region* getRegion();
@@ -69,8 +71,6 @@ protected: 
private:

    void generateMesh();



    static void flushLayer(Layer* layer);



    Layer* mLayer;

}; // class LayerRenderer

libs/hwui/ResourceCache.cpp

+3 −3
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ void ResourceCache::deleteResourceReferenceLocked(void* resource, ResourceRefere 
            }

            break;

            case kLayer: {

                Layer* layer = (Layer*) resource;

                layer->freeResourcesLocked();

                delete layer;

                // No need to check for hasInstance, layers only exist

                // when we have a Caches instance

                Caches::getInstance().deleteLayerDeferred((Layer*) resource);

            }

            break;

        }