Merge "Disable texture atlas" (3eb9882a) · Commits · e / os / android_frameworks_base

libs/hwui/renderthread/CanvasContext.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -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,8 +229,10 @@ void GlobalContext::setTextureAtlas(const sp<GraphicBuffer>& buffer,
		}

		void GlobalContext::initAtlas() {
		if (USE_TEXTURE_ATLAS) {
		Caches::getInstance().assetAtlas.init(mAtlasBuffer, mAtlasMap, mAtlasMapSize);
		}
		}

		void GlobalContext::usePBufferSurface() {
		LOG_ALWAYS_FATAL_IF(mEglDisplay == EGL_NO_DISPLAY,