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

Commit 348f08f4 authored by Dave Burke's avatar Dave Burke Committed by Android (Google) Code Review
Browse files

Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev

parents 5e1c74db 54643d72

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;

        }