Merge "Don't update 9patches on every frame." (b154dfe7) · Commits · e / os / android_frameworks_base

libs/hwui/OpenGLRenderer.cpp

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -692,9 +692,8 @@ void OpenGLRenderer::drawPatch(SkBitmap* bitmap, const int32_t* xDivs, const int
	SkXfermode::Mode mode;		SkXfermode::Mode mode;
	getAlphaAndMode(paint, &alpha, &mode);		getAlphaAndMode(paint, &alpha, &mode);

	Patch* mesh = mCaches.patchCache.get(width, height);		const Patch* mesh = mCaches.patchCache.get(bitmap->width(), bitmap->height(),
	mesh->updateVertices(bitmap->width(), bitmap->height(),left, top, right, bottom,		right - left, bottom - top, xDivs, yDivs, width, height);
	xDivs, yDivs, width, height);

	// Specify right and bottom as +1.0f from left/top to prevent scaling since the		// Specify right and bottom as +1.0f from left/top to prevent scaling since the
	// patch mesh already defines the final size		// patch mesh already defines the final size

libs/hwui/Patch.h

+15 −10

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#define ANDROID_UI_PATCH_H		#define ANDROID_UI_PATCH_H

	#include <sys/types.h>		#include <sys/types.h>
			#include <cstring>

	#include "Vertex.h"		#include "Vertex.h"

	@@ -28,24 +29,28 @@ namespace uirenderer {
	* Description of a patch.		* Description of a patch.
	*/		*/
	struct PatchDescription {		struct PatchDescription {
	PatchDescription(): xCount(0), yCount(0) { }		PatchDescription(): bitmapWidth(0), bitmapHeight(0),
	PatchDescription(const uint32_t xCount, const uint32_t yCount):		pixelWidth(0), pixelHeight(0), xCount(0), yCount(0) { }
			PatchDescription(const float bitmapWidth, const float bitmapHeight,
			const float pixelWidth, const float pixelHeight,
			const uint32_t xCount, const uint32_t yCount):
			bitmapWidth(bitmapWidth), bitmapHeight(bitmapHeight),
			pixelWidth(pixelWidth), pixelHeight(pixelHeight),
	xCount(xCount), yCount(yCount) { }		xCount(xCount), yCount(yCount) { }
	PatchDescription(const PatchDescription& description):		PatchDescription(const PatchDescription& description):
			bitmapWidth(description.bitmapWidth), bitmapHeight(description.bitmapHeight),
			pixelWidth(description.pixelWidth), pixelHeight(description.pixelHeight),
	xCount(description.xCount), yCount(description.yCount) { }		xCount(description.xCount), yCount(description.yCount) { }

			float bitmapWidth;
			float bitmapHeight;
			float pixelWidth;
			float pixelHeight;
	uint32_t xCount;		uint32_t xCount;
	uint32_t yCount;		uint32_t yCount;

	bool operator<(const PatchDescription& rhs) const {		bool operator<(const PatchDescription& rhs) const {
	if (xCount == rhs.xCount) {		return memcmp(this, &rhs, sizeof(PatchDescription)) < 0;
	return yCount < rhs.yCount;
	}
	return xCount < rhs.xCount;
	}

	bool operator==(const PatchDescription& rhs) const {
	return xCount == rhs.xCount && yCount == rhs.yCount;
	}		}
	}; // struct PatchDescription		}; // struct PatchDescription

libs/hwui/PatchCache.cpp

+29 −16

Original line number	Original line	Diff line number	Diff line
	@@ -29,42 +29,55 @@ namespace uirenderer {
	// Constructors/destructor		// Constructors/destructor
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	PatchCache::PatchCache(): mCache(DEFAULT_PATCH_CACHE_SIZE) {		PatchCache::PatchCache(): mMaxEntries(DEFAULT_PATCH_CACHE_SIZE) {
	}		}

	PatchCache::PatchCache(uint32_t maxEntries): mCache(maxEntries) {		PatchCache::PatchCache(uint32_t maxEntries): mMaxEntries(maxEntries) {
	}		}

	PatchCache::~PatchCache() {		PatchCache::~PatchCache() {
	clear();		clear();
	}		}

	///////////////////////////////////////////////////////////////////////////////
	// Callbacks
	///////////////////////////////////////////////////////////////////////////////

	void PatchCache::operator()(PatchDescription& description, Patch*& mesh) {
	if (mesh) delete mesh;
	}

	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////
	// Caching		// Caching
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	void PatchCache::clear() {		void PatchCache::clear() {
	mCache.setOnEntryRemovedListener(this);		size_t count = mCache.size();
			for (int i = 0; i < count; i++) {
			delete mCache.valueAt(i);
			}
	mCache.clear();		mCache.clear();
	mCache.setOnEntryRemovedListener(NULL);
	}		}

	Patch* PatchCache::get(uint32_t width, uint32_t height) {		Patch* PatchCache::get(const float bitmapWidth, const float bitmapHeight,
	const PatchDescription description(width, height);		const float pixelWidth, const float pixelHeight,
			const int32_t* xDivs, const int32_t* yDivs,
			const uint32_t width, const uint32_t height) {

			const PatchDescription description(bitmapWidth, bitmapHeight,
			pixelWidth, pixelHeight, width, height);

			ssize_t index = mCache.indexOfKey(description);
			Patch* mesh = NULL;
			if (index >= 0) {
			mesh = mCache.valueAt(index);
			}

	Patch* mesh = mCache.get(description);
	if (!mesh) {		if (!mesh) {
	PATCH_LOGD("Creating new patch mesh, w=%d h=%d", width, height);		PATCH_LOGD("Creating new patch mesh, w=%d h=%d", width, height);

	mesh = new Patch(width, height);		mesh = new Patch(width, height);
	mCache.put(description, mesh);		mesh->updateVertices(bitmapWidth, bitmapHeight, 0.0f, 0.0f,
			pixelWidth, pixelHeight, xDivs, yDivs, width, height);

			if (mCache.size() >= mMaxEntries) {
			delete mCache.valueAt(0);
			mCache.removeItemsAt(0, 1);
			}

			mCache.add(description, mesh);
	}		}

	return mesh;		return mesh;

libs/hwui/PatchCache.h

+9 −10

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,9 @@
	#ifndef ANDROID_UI_PATCH_CACHE_H		#ifndef ANDROID_UI_PATCH_CACHE_H
	#define ANDROID_UI_PATCH_CACHE_H		#define ANDROID_UI_PATCH_CACHE_H

			#include <utils/KeyedVector.h>

	#include "Patch.h"		#include "Patch.h"
	#include "GenerationCache.h"

	namespace android {		namespace android {
	namespace uirenderer {		namespace uirenderer {
	@@ -41,23 +42,21 @@ namespace uirenderer {
	// Cache		// Cache
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	class PatchCache: public OnEntryRemoved<PatchDescription, Patch*> {		class PatchCache {
	public:		public:
	PatchCache();		PatchCache();
	PatchCache(uint32_t maxCapacity);		PatchCache(uint32_t maxCapacity);
	~PatchCache();		~PatchCache();

	/**		Patch* get(const float bitmapWidth, const float bitmapHeight,
	* Used as a callback when an entry is removed from the cache.		const float pixelWidth, const float pixelHeight,
	* Do not invoke directly.		const int32_t* xDivs, const int32_t* yDivs,
	*/		const uint32_t width, const uint32_t height);
	void operator()(PatchDescription& description, Patch*& mesh);

	Patch* get(uint32_t width, uint32_t height);
	void clear();		void clear();

	private:		private:
	GenerationCache<PatchDescription, Patch*> mCache;		uint32_t mMaxEntries;
			KeyedVector<PatchDescription, Patch*> mCache;
	}; // class PatchCache		}; // class PatchCache

	}; // namespace uirenderer		}; // namespace uirenderer

libs/hwui/Properties.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@
	#define DEFAULT_TEXTURE_CACHE_SIZE 22.0f		#define DEFAULT_TEXTURE_CACHE_SIZE 22.0f
	#define DEFAULT_LAYER_CACHE_SIZE 4.0f		#define DEFAULT_LAYER_CACHE_SIZE 4.0f
	#define DEFAULT_PATH_CACHE_SIZE 4.0f		#define DEFAULT_PATH_CACHE_SIZE 4.0f
	#define DEFAULT_PATCH_CACHE_SIZE 100		#define DEFAULT_PATCH_CACHE_SIZE 512
	#define DEFAULT_GRADIENT_CACHE_SIZE 0.5f		#define DEFAULT_GRADIENT_CACHE_SIZE 0.5f
	#define DEFAULT_DROP_SHADOW_CACHE_SIZE 2.0f		#define DEFAULT_DROP_SHADOW_CACHE_SIZE 2.0f
	#define DEFAULT_FBO_CACHE_SIZE 25		#define DEFAULT_FBO_CACHE_SIZE 25