From c8affe0e1b1f3f63b12477f832a1a66019ac0df8 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 29 May 2014 14:50:37 -0700
Subject: Re-enable atlas

 Bug: 14590563

Change-Id: I04ed5bf1b2654dab4a65c1e43faaeba32459870f
---
 libs/hwui/renderthread/CanvasContext.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'libs')

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 160fbea..0fe01a7 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -31,7 +31,6 @@
 
 #define PROPERTY_RENDER_DIRTY_REGIONS "debug.hwui.render_dirty_regions"
 #define GLES_VERSION 2
-#define USE_TEXTURE_ATLAS false
 
 // Android-specific addition that is used to show when frames began in systrace
 EGLAPI void EGLAPIENTRY eglBeginFrame(EGLDisplay dpy, EGLSurface surface);
@@ -229,7 +228,7 @@ void GlobalContext::setTextureAtlas(const sp<GraphicBuffer>& buffer,
 }
 
 void GlobalContext::initAtlas() {
-    if (USE_TEXTURE_ATLAS) {
+    if (mAtlasBuffer.get()) {
         Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize);
     }
 }
-- 
cgit v1.1