From 45263e2475ac6a885dbd78eff7d4e44f374e5237 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Wed, 7 Aug 2013 13:35:20 -0700
Subject: [PATCH] don't hardcode debug texture dimensions

Change-Id: I356333801d246a8cafb3e977a77dc7325e8b822d
---
 libs/gui/GLConsumer.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 363e25a16a..0f7057d559 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -53,8 +53,10 @@ namespace android {
 static const struct {
     size_t width, height;
     char const* bits;
-} kDebugData = { 11, 8,
-    "__X_____X_____X___X_____XXXXXXX___XX_XXX_XX_XXXXXXXXXXXX_XXXXXXX_XX_X_____X_X___XX_XX___" };
+} kDebugData = { 15, 12,
+    "___________________________________XX_XX_______X_X_____X_X____X_XXXXXXX_X____XXXXXXXXXXX__"
+    "___XX_XXX_XX_______XXXXXXX_________X___X_________X_____X__________________________________"
+};
 
 // Transform matrices
 static float mtxIdentity[16] = {
@@ -213,7 +215,8 @@ status_t GLConsumer::releaseTexImage() {
         if (CC_UNLIKELY(mReleasedTexImageBuffer == NULL)) {
             // The first time, create the debug texture in case the application
             // continues to use it.
-            sp<GraphicBuffer> buffer = new GraphicBuffer(11, 8, PIXEL_FORMAT_RGBA_8888,
+            sp<GraphicBuffer> buffer = new GraphicBuffer(
+                    kDebugData.width, kDebugData.height, PIXEL_FORMAT_RGBA_8888,
                     GraphicBuffer::USAGE_SW_WRITE_RARELY);
             uint32_t* bits;
             buffer->lock(GraphicBuffer::USAGE_SW_WRITE_RARELY, reinterpret_cast<void**>(&bits));
@@ -222,7 +225,7 @@ status_t GLConsumer::releaseTexImage() {
             memset(bits, 0, w*h*4);
             for (size_t y=0 ; y<kDebugData.height ; y++) {
                 for (size_t x=0 ; x<kDebugData.width ; x++) {
-                    bits[x] = (kDebugData.bits[y*11+x] == 'X') ? 0xFF000000 : 0xFFFFFFFF;
+                    bits[x] = (kDebugData.bits[y*kDebugData.width+x] == 'X') ? 0xFF000000 : 0xFFFFFFFF;
                 }
                 bits += w;
             }
-- 
2.11.0