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

Author: Dave Burke

libs/hwui/Caches.cpp

@@ -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

@@ -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;
         }