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

Commit 2458c4eb authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am 33ffed0a: am 348f08f4: Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev 

* commit '33ffed0a':
  make sure to destroy GL objects on the GL thread
parents 56ead426 33ffed0a

libs/hwui/Caches.cpp

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ void Caches::clearGarbage() { 
    size_t count = mLayerGarbage.size();

    for (size_t i = 0; i < count; i++) {

        Layer* layer = mLayerGarbage.itemAt(i);

        LayerRenderer::destroyLayer(layer);

        delete layer;

    }

    mLayerGarbage.clear();

libs/hwui/ResourceCache.cpp

+1 −2
Original line number Diff line number Diff line
@@ -326,8 +326,7 @@ void ResourceCache::deleteResourceReferenceLocked(void* resource, ResourceRefere 
            break;

            case kLayer: {

                Layer* layer = (Layer*) resource;

                layer->freeResourcesLocked();

                delete layer;

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

            }

            break;

        }