diff options
| author | John Reck <jreck@google.com> | 2014-05-29 22:23:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 22:23:38 +0000 |
| commit | e2960b6fd2d31f8a729ce9d180bffc947c0d6464 (patch) | |
| tree | b6773d61c2b296ef9373964d8c5db4371a24afdc | |
| parent | f68e9d834cbc67dd409076f4d574a55f74d566e2 (diff) | |
| parent | c8affe0e1b1f3f63b12477f832a1a66019ac0df8 (diff) | |
| download | frameworks_base-e2960b6fd2d31f8a729ce9d180bffc947c0d6464.zip frameworks_base-e2960b6fd2d31f8a729ce9d180bffc947c0d6464.tar.gz frameworks_base-e2960b6fd2d31f8a729ce9d180bffc947c0d6464.tar.bz2 | |
Merge "Re-enable atlas" into lmp-preview-dev
| -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); } } |