diff options
| author | John Reck <jreck@google.com> | 2014-05-29 14:50:37 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-05-29 14:50:37 -0700 |
| commit | c8affe0e1b1f3f63b12477f832a1a66019ac0df8 (patch) | |
| tree | a47dd7306b9979581a6a9d84b48d7b2e2813a632 /libs | |
| parent | 45d01929291eba56e1bce582192941446b86bf5a (diff) | |
| download | frameworks_base-c8affe0e1b1f3f63b12477f832a1a66019ac0df8.zip frameworks_base-c8affe0e1b1f3f63b12477f832a1a66019ac0df8.tar.gz frameworks_base-c8affe0e1b1f3f63b12477f832a1a66019ac0df8.tar.bz2 | |
Re-enable atlas
Bug: 14590563
Change-Id: I04ed5bf1b2654dab4a65c1e43faaeba32459870f
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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); } } |