Merge "Simplify Texture member initialization" (c467adac) · Commits · e / os / android_frameworks_base

libs/hwui/GradientCache.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient,
		GradientInfo info;
		getGradientInfo(colors, count, info);

		Texture* texture = new Texture();
		Texture* texture = new Texture(Caches::getInstance());
		texture->width = info.width;
		texture->height = 2;
		texture->blend = info.hasAlpha;

libs/hwui/Texture.cpp

+0 −40

Original line number	Diff line number	Diff line
		@@ -24,46 +24,6 @@
		namespace android {
		namespace uirenderer {

		Texture::Texture()
		: id(0)
		, generation(0)
		, blend(false)
		, width(0)
		, height(0)
		, cleanup(false)
		, bitmapSize(0)
		, mipMap(false)
		, uvMapper(nullptr)
		, isInUse(false)
		, mWrapS(GL_CLAMP_TO_EDGE)
		, mWrapT(GL_CLAMP_TO_EDGE)
		, mMinFilter(GL_NEAREST)
		, mMagFilter(GL_NEAREST)
		, mFirstFilter(true)
		, mFirstWrap(true)
		, mCaches(Caches::getInstance()) {
		}

		Texture::Texture(Caches& caches)
		: id(0)
		, generation(0)
		, blend(false)
		, width(0)
		, height(0)
		, cleanup(false)
		, bitmapSize(0)
		, mipMap(false)
		, uvMapper(nullptr)
		, isInUse(false)
		, mWrapS(GL_CLAMP_TO_EDGE)
		, mWrapT(GL_CLAMP_TO_EDGE)
		, mMinFilter(GL_NEAREST)
		, mMagFilter(GL_NEAREST)
		, mFirstFilter(true)
		, mFirstWrap(true)
		, mCaches(caches) {
		}

		void Texture::setWrapST(GLenum wrapS, GLenum wrapT, bool bindTexture, bool force,
		GLenum renderTarget) {

libs/hwui/Texture.h

+19 −20

Original line number	Diff line number	Diff line
		@@ -30,8 +30,7 @@ class UvMapper;
		*/
		class Texture {
		public:
		Texture();
		Texture(Caches& caches);
		Texture(Caches& caches) : mCaches(caches) { }

		virtual ~Texture() { }

		@@ -59,62 +58,62 @@ public:
		/**
		* Name of the texture.
		*/
		GLuint id;
		GLuint id = 0;
		/**
		* Generation of the backing bitmap,
		*/
		uint32_t generation;
		uint32_t generation = 0;
		/**
		* Indicates whether the texture requires blending.
		*/
		bool blend;
		bool blend = false;
		/**
		* Width of the backing bitmap.
		*/
		uint32_t width;
		uint32_t width = 0;
		/**
		* Height of the backing bitmap.
		*/
		uint32_t height;
		uint32_t height = 0;
		/**
		* Indicates whether this texture should be cleaned up after use.
		*/
		bool cleanup;
		bool cleanup= false;
		/**
		* Optional, size of the original bitmap.
		*/
		uint32_t bitmapSize;
		uint32_t bitmapSize = 0;
		/**
		* Indicates whether this texture will use trilinear filtering.
		*/
		bool mipMap;
		bool mipMap = false;

		/**
		* Optional, pointer to a texture coordinates mapper.
		*/
		const UvMapper* uvMapper;
		const UvMapper* uvMapper = nullptr;

		/**
		* Whether or not the Texture is marked in use and thus not evictable for
		* the current frame. This is reset at the start of a new frame.
		*/
		bool isInUse;
		bool isInUse = false;

		private:
		/**
		* Last wrap modes set on this texture. Defaults to GL_CLAMP_TO_EDGE.
		* Last wrap modes set on this texture.
		*/
		GLenum mWrapS;
		GLenum mWrapT;
		GLenum mWrapS = GL_CLAMP_TO_EDGE;
		GLenum mWrapT = GL_CLAMP_TO_EDGE;

		/**
		* Last filters set on this texture. Defaults to GL_NEAREST.
		* Last filters set on this texture.
		*/
		GLenum mMinFilter;
		GLenum mMagFilter;
		GLenum mMinFilter = GL_NEAREST;
		GLenum mMagFilter = GL_NEAREST;

		bool mFirstFilter;
		bool mFirstWrap;
		bool mFirstFilter = true;
		bool mFirstWrap = true;

		Caches& mCaches;
		}; // struct Texture

libs/hwui/TextureCache.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ Texture* TextureCache::getCachedTexture(const SkBitmap* bitmap) {
		}

		if (canCache) {
		texture = new Texture();
		texture = new Texture(Caches::getInstance());
		texture->bitmapSize = size;
		generateTexture(bitmap, texture, false);

		@@ -206,7 +206,7 @@ Texture* TextureCache::get(const SkBitmap* bitmap) {
		}

		const uint32_t size = bitmap->rowBytes() * bitmap->height();
		texture = new Texture();
		texture = new Texture(Caches::getInstance());
		texture->bitmapSize = size;
		generateTexture(bitmap, texture, false);
		texture->cleanup = true;
		@@ -216,7 +216,7 @@ Texture* TextureCache::get(const SkBitmap* bitmap) {
		}

		Texture* TextureCache::getTransient(const SkBitmap* bitmap) {
		Texture* texture = new Texture();
		Texture* texture = new Texture(Caches::getInstance());
		texture->bitmapSize = bitmap->rowBytes() * bitmap->height();
		texture->cleanup = true;

libs/hwui/tests/main.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -89,8 +89,6 @@ public:

		android::uirenderer::Rect DUMMY;

		std::vector< sp<RenderNode> > cards;

		DisplayListRenderer* renderer = startRecording(rootNode);
		animation.createContent(width, height, renderer);
		endRecording(renderer, rootNode);