am b5797c9e: Merge "Re-enable atlas" into lmp-preview-dev (2143fdba) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/CanvasContext.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}