commit 54643d72f86d0ee0b23e3643ac9257d52ddfae6b
author Mathias Agopian <mathias@google.com> Tue Sep 25 21:30:22 2012 -0700
committer Mathias Agopian <mathias@google.com> Tue Sep 25 21:41:38 2012 -0700
tree fa42aca7c07a2a22050733a78fcaf72f20c4db51
parent cefbd1438c9054e3a34b4ab93b4b26b427604cb1

make sure to destroy GL objects on the GL thread

Bug: 7195815
Change-Id: I5bcac61cd0b903d1ccca0754fdb9cb1023efbe0f

libs/hwui/Caches.cpp

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 898962a..4459495 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -232,7 +232,7 @@
     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

diff --git a/libs/hwui/ResourceCache.cpp b/libs/hwui/ResourceCache.cpp
index 18d8324..81f7b94 100644
--- a/libs/hwui/ResourceCache.cpp
+++ b/libs/hwui/ResourceCache.cpp
@@ -326,8 +326,7 @@
             break;
             case kLayer: {
                 Layer* layer = (Layer*) resource;
-                layer->freeResourcesLocked();
-                delete layer;
+                Caches::getInstance().deleteLayerDeferred(layer);
             }
             break;
         }