diff options
| author | John Reck <jreck@google.com> | 2014-05-14 23:59:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 23:59:14 +0000 |
| commit | 3eb9882a67167141817faef6556c0393fa6bab72 (patch) | |
| tree | f2a5492ddcefe85b5472f482a741165352361dab /libs | |
| parent | 38d3ccc65d2aaf70675def4cd0e40652a2bb8356 (diff) | |
| parent | cdfeef6624613ca06fe8a7edfb92608afb0499ee (diff) | |
| download | frameworks_base-3eb9882a67167141817faef6556c0393fa6bab72.zip frameworks_base-3eb9882a67167141817faef6556c0393fa6bab72.tar.gz frameworks_base-3eb9882a67167141817faef6556c0393fa6bab72.tar.bz2 | |
Merge "Disable texture atlas"
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() { |