diff options
| author | John Reck <jreck@google.com> | 2014-05-14 16:35:46 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-05-14 23:59:01 +0000 |
| commit | cdfeef6624613ca06fe8a7edfb92608afb0499ee (patch) | |
| tree | fa9b8d5665e2d98e5dfd3f1d15203e00bb24ca6a /libs | |
| parent | 54b6fd0cbe48fc0980da0617352785c973c60c86 (diff) | |
| download | frameworks_base-cdfeef6624613ca06fe8a7edfb92608afb0499ee.zip frameworks_base-cdfeef6624613ca06fe8a7edfb92608afb0499ee.tar.gz frameworks_base-cdfeef6624613ca06fe8a7edfb92608afb0499ee.tar.bz2 | |
Disable texture atlas
Bug: 14952384
Change-Id: If38b3e4c08c2c3dd9c00ae9e6e8c10e208e737d1
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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() { |