From cdfeef6624613ca06fe8a7edfb92608afb0499ee Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 14 May 2014 16:35:46 -0700
Subject: Disable texture atlas

 Bug: 14952384

Change-Id: If38b3e4c08c2c3dd9c00ae9e6e8c10e208e737d1
---
 libs/hwui/renderthread/CanvasContext.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libs')

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 5754536..48cd8fc 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -31,11 +31,10 @@
 
 #define PROPERTY_RENDER_DIRTY_REGIONS "debug.hwui.render_dirty_regions"
 #define GLES_VERSION 2
+#define USE_TEXTURE_ATLAS false
 
-#ifdef USE_OPENGL_RENDERER
 // Android-specific addition that is used to show when frames began in systrace
 EGLAPI void EGLAPIENTRY eglBeginFrame(EGLDisplay dpy, EGLSurface surface);
-#endif
 
 namespace android {
 namespace uirenderer {
@@ -230,7 +229,9 @@ void GlobalContext::setTextureAtlas(const sp<GraphicBuffer>& buffer,
 }
 
 void GlobalContext::initAtlas() {
-    Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize);
+    if (USE_TEXTURE_ATLAS) {
+        Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize);
+    }
 }
 
 void GlobalContext::usePBufferSurface() {
-- 
cgit v1.1