From 574cf6070d34e66dfd6f2006937986eddd1f09e7 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Sun, 23 Sep 2012 14:45:31 -0700
Subject: [PATCH 1/2] Make sure we never bind to texture #0 Bug #7195815

Change-Id: Ibec4b2aa4c580419eb5eb61adae6c9c960694d0c
---
 libs/hwui/font/CacheTexture.h | 48 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/libs/hwui/font/CacheTexture.h b/libs/hwui/font/CacheTexture.h
index bf1f4a99ba91c..e9ebf94de2ce4 100644
--- a/libs/hwui/font/CacheTexture.h
+++ b/libs/hwui/font/CacheTexture.h
@@ -77,12 +77,7 @@ public:
     }
 
     ~CacheTexture() {
-        if (mTexture) {
-            delete[] mTexture;
-        }
-        if (mTextureId) {
-            glDeleteTextures(1, &mTextureId);
-        }
+        releaseTexture();
         reset();
     }
 
@@ -105,38 +100,40 @@ public:
 
     void releaseTexture() {
         if (mTexture) {
-            glDeleteTextures(1, &mTextureId);
             delete[] mTexture;
             mTexture = NULL;
+        }
+        if (mTextureId) {
+            glDeleteTextures(1, &mTextureId);
             mTextureId = 0;
         }
+        mDirty = false;
     }
 
     /**
      * This method assumes that the proper texture unit is active.
      */
     void allocateTexture() {
-        int width = mWidth;
-        int height = mHeight;
-
-        mTexture = new uint8_t[width * height];
+        if (!mTexture) {
+            mTexture = new uint8_t[mWidth * mHeight];
+        }
 
         if (!mTextureId) {
             glGenTextures(1, &mTextureId);
+
+            glBindTexture(GL_TEXTURE_2D, mTextureId);
+            glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+            // Initialize texture dimensions
+            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, mWidth, mHeight, 0,
+                    GL_ALPHA, GL_UNSIGNED_BYTE, 0);
+
+            const GLenum filtering = getLinearFiltering() ? GL_LINEAR : GL_NEAREST;
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
+
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
         }
-
-        glBindTexture(GL_TEXTURE_2D, mTextureId);
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        // Initialize texture dimensions
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0,
-                GL_ALPHA, GL_UNSIGNED_BYTE, 0);
-
-        const GLenum filtering = getLinearFiltering() ? GL_LINEAR : GL_NEAREST;
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
-
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     }
 
     bool fitBitmap(const SkGlyph& glyph, uint32_t* retOriginX, uint32_t* retOriginY);
@@ -153,7 +150,8 @@ public:
         return mTexture;
     }
 
-    inline GLuint getTextureId() const {
+    GLuint getTextureId() {
+        allocateTexture();
         return mTextureId;
     }
 

From 4285de3c8bc77856a2df98894f74bb7333f1d348 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Sun, 23 Sep 2012 14:46:35 -0700
Subject: [PATCH 2/2] Fix overdraw debug on QCOM

Disable the use of the tiling extension when overdraw debug is
turned on.

Change-Id: Ib0a0b7d1998146aa0c7efef2d3822f9997efb123
---
 libs/hwui/Caches.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 22f1decc7ad5c..898962a4ced78 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -435,15 +435,13 @@ void Caches::resetScissor() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void Caches::startTiling(GLuint x, GLuint y, GLuint width, GLuint height, bool opaque) {
-    if (extensions.hasTiledRendering()) {
-        glStartTilingQCOM(x, y, width, height,
-                (opaque ? GL_NONE : GL_COLOR_BUFFER_BIT0_QCOM) |
-                (debugOverdraw ? GL_STENCIL_BUFFER_BIT0_QCOM : 0));
+    if (extensions.hasTiledRendering() && !debugOverdraw) {
+        glStartTilingQCOM(x, y, width, height, (opaque ? GL_NONE : GL_COLOR_BUFFER_BIT0_QCOM));
     }
 }
 
 void Caches::endTiling() {
-    if (extensions.hasTiledRendering()) {
+    if (extensions.hasTiledRendering() && !debugOverdraw) {
         glEndTilingQCOM(GL_COLOR_BUFFER_BIT0_QCOM);
     }
 }