Merge "Assume a texture is unbound after deleting it Bug #9316260"

1 files changed, 6 insertions, 1 deletions

diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h
index d249741f703b..d48ec5924d62 100644
--- a/libs/hwui/Texture.h
+++ b/libs/hwui/Texture.h
@@ -52,6 +52,11 @@ public:
             bool force = false, GLenum renderTarget = GL_TEXTURE_2D);
 
     /**
+     * Convenience method to call glDeleteTextures() on this texture's id.
+     */
+    void deleteTexture() const;
+
+    /**
      * Name of the texture.
      */
     GLuint id;
@@ -113,7 +118,7 @@ public:
     AutoTexture(const Texture* texture): mTexture(texture) { }
     ~AutoTexture() {
         if (mTexture && mTexture->cleanup) {
-            glDeleteTextures(1, &mTexture->id);
+            mTexture->deleteTexture();
             delete mTexture;
         }
     }