Merge "Move texture upload behavior to TextureState" (0e35962e) · Commits · e / os / android_frameworks_base

libs/hwui/TextureCache.cpp

+3 −134

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		#include <GLES2/gl2.h>

		#include <SkCanvas.h>
		#include <SkPixelRef.h>

		#include <utils/Mutex.h>

		#include "AssetAtlas.h"
		@@ -169,7 +166,7 @@ Texture* TextureCache::getCachedTexture(const SkBitmap* bitmap, AtlasUsageType a
		if (canCache) {
		texture = new Texture(Caches::getInstance());
		texture->bitmapSize = size;
		generateTexture(bitmap, texture, false);
		Caches::getInstance().textureState().generateTexture(bitmap, texture, false);

		mSize += size;
		TEXTURE_LOGD("TextureCache::get: create texture(%p): name, size, mSize = %d, %d, %d",
		@@ -182,7 +179,7 @@ Texture* TextureCache::getCachedTexture(const SkBitmap* bitmap, AtlasUsageType a
		} else if (!texture->isInUse && bitmap->getGenerationID() != texture->generation) {
		// Texture was in the cache but is dirty, re-upload
		// TODO: Re-adjust the cache size if the bitmap's dimensions have changed
		generateTexture(bitmap, texture, true);
		Caches::getInstance().textureState().generateTexture(bitmap, texture, true);
		}

		return texture;
		@@ -207,7 +204,7 @@ Texture* TextureCache::get(const SkBitmap* bitmap, AtlasUsageType atlasUsageType
		const uint32_t size = bitmap->rowBytes() * bitmap->height();
		texture = new Texture(Caches::getInstance());
		texture->bitmapSize = size;
		generateTexture(bitmap, texture, false);
		Caches::getInstance().textureState().generateTexture(bitmap, texture, false);
		texture->cleanup = true;
		}

		@@ -249,133 +246,5 @@ void TextureCache::flush() {
		}
		}

		void TextureCache::generateTexture(const SkBitmap* bitmap, Texture* texture, bool regenerate) {
		SkAutoLockPixels alp(*bitmap);

		if (!bitmap->readyToDraw()) {
		ALOGE("Cannot generate texture from bitmap");
		return;
		}

		ATRACE_FORMAT("Upload %ux%u Texture", bitmap->width(), bitmap->height());

		// We could also enable mipmapping if both bitmap dimensions are powers
		// of 2 but we'd have to deal with size changes. Let's keep this simple
		const bool canMipMap = Caches::getInstance().extensions().hasNPot();

		// If the texture had mipmap enabled but not anymore,
		// force a glTexImage2D to discard the mipmap levels
		const bool resize = !regenerate \|\| bitmap->width() != int(texture->width) \|\|
		bitmap->height() != int(texture->height) \|\|
		(regenerate && canMipMap && texture->mipMap && !bitmap->hasHardwareMipMap());

		if (!regenerate) {
		glGenTextures(1, &texture->id);
		}

		texture->generation = bitmap->getGenerationID();
		texture->width = bitmap->width();
		texture->height = bitmap->height();

		Caches::getInstance().textureState().bindTexture(texture->id);

		switch (bitmap->colorType()) {
		case kAlpha_8_SkColorType:
		uploadToTexture(resize, GL_ALPHA, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),
		texture->width, texture->height, GL_UNSIGNED_BYTE, bitmap->getPixels());
		texture->blend = true;
		break;
		case kRGB_565_SkColorType:
		uploadToTexture(resize, GL_RGB, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),
		texture->width, texture->height, GL_UNSIGNED_SHORT_5_6_5, bitmap->getPixels());
		texture->blend = false;
		break;
		case kN32_SkColorType:
		uploadToTexture(resize, GL_RGBA, bitmap->rowBytesAsPixels(), bitmap->bytesPerPixel(),
		texture->width, texture->height, GL_UNSIGNED_BYTE, bitmap->getPixels());
		// Do this after calling getPixels() to make sure Skia's deferred
		// decoding happened
		texture->blend = !bitmap->isOpaque();
		break;
		case kARGB_4444_SkColorType:
		case kIndex_8_SkColorType:
		uploadLoFiTexture(resize, bitmap, texture->width, texture->height);
		texture->blend = !bitmap->isOpaque();
		break;
		default:
		ALOGW("Unsupported bitmap colorType: %d", bitmap->colorType());
		break;
		}

		if (canMipMap) {
		texture->mipMap = bitmap->hasHardwareMipMap();
		if (texture->mipMap) {
		glGenerateMipmap(GL_TEXTURE_2D);
		}
		}

		if (!regenerate) {
		texture->setFilter(GL_NEAREST);
		texture->setWrap(GL_CLAMP_TO_EDGE);
		}
		}

		void TextureCache::uploadLoFiTexture(bool resize, const SkBitmap* bitmap,
		uint32_t width, uint32_t height) {
		SkBitmap rgbaBitmap;
		rgbaBitmap.allocPixels(SkImageInfo::MakeN32(width, height, bitmap->alphaType()));
		rgbaBitmap.eraseColor(0);

		SkCanvas canvas(rgbaBitmap);
		canvas.drawBitmap(*bitmap, 0.0f, 0.0f, nullptr);

		uploadToTexture(resize, GL_RGBA, rgbaBitmap.rowBytesAsPixels(), rgbaBitmap.bytesPerPixel(),
		width, height, GL_UNSIGNED_BYTE, rgbaBitmap.getPixels());
		}

		void TextureCache::uploadToTexture(bool resize, GLenum format, GLsizei stride, GLsizei bpp,
		GLsizei width, GLsizei height, GLenum type, const GLvoid * data) {
		glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
		const bool useStride = stride != width
		&& Caches::getInstance().extensions().hasUnpackRowLength();
		if ((stride == width) \|\| useStride) {
		if (useStride) {
		glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
		}

		if (resize) {
		glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, data);
		} else {
		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, data);
		}

		if (useStride) {
		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
		}
		} else {
		// With OpenGL ES 2.0 we need to copy the bitmap in a temporary buffer
		// if the stride doesn't match the width

		GLvoid * temp = (GLvoid ) malloc(width height * bpp);
		if (!temp) return;

		uint8_t * pDst = (uint8_t *)temp;
		uint8_t * pSrc = (uint8_t *)data;
		for (GLsizei i = 0; i < height; i++) {
		memcpy(pDst, pSrc, width * bpp);
		pDst += width * bpp;
		pSrc += stride * bpp;
		}

		if (resize) {
		glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, temp);
		} else {
		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, temp);
		}

		free(temp);
		}
		}

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

libs/hwui/TextureCache.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -144,18 +144,6 @@ private:
		Texture* get(const SkBitmap* bitmap, AtlasUsageType atlasUsageType);
		Texture* getCachedTexture(const SkBitmap* bitmap, AtlasUsageType atlasUsageType);

		/**
		* Generates the texture from a bitmap into the specified texture structure.
		*
		* @param regenerate If true, the bitmap data is reuploaded into the texture, but
		* no new texture is generated.
		*/
		void generateTexture(const SkBitmap* bitmap, Texture* texture, bool regenerate = false);

		void uploadLoFiTexture(bool resize, const SkBitmap* bitmap, uint32_t width, uint32_t height);
		void uploadToTexture(bool resize, GLenum format, GLsizei stride, GLsizei bpp,
		GLsizei width, GLsizei height, GLenum type, const GLvoid * data);

		LruCache<uint32_t, Texture*> mCache;

		uint32_t mSize;

libs/hwui/renderstate/TextureState.cpp

+136 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,14 @@
		*/
		#include "renderstate/TextureState.h"

		#include "Caches.h"
		#include "utils/TraceUtils.h"

		#include <GLES3/gl3.h>
		#include <memory>
		#include <SkCanvas.h>
		#include <SkBitmap.h>

		namespace android {
		namespace uirenderer {

		@@ -26,6 +34,134 @@ const GLenum kTextureUnits[] = {
		GL_TEXTURE3
		};

		static void uploadToTexture(bool resize, GLenum format, GLenum type, GLsizei stride, GLsizei bpp,
		GLsizei width, GLsizei height, const GLvoid * data) {

		glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
		const bool useStride = stride != width
		&& Caches::getInstance().extensions().hasUnpackRowLength();
		if ((stride == width) \|\| useStride) {
		if (useStride) {
		glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
		}

		if (resize) {
		glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, data);
		} else {
		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, data);
		}

		if (useStride) {
		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
		}
		} else {
		// With OpenGL ES 2.0 we need to copy the bitmap in a temporary buffer
		// if the stride doesn't match the width

		GLvoid * temp = (GLvoid ) malloc(width height * bpp);
		if (!temp) return;

		uint8_t * pDst = (uint8_t *)temp;
		uint8_t * pSrc = (uint8_t *)data;
		for (GLsizei i = 0; i < height; i++) {
		memcpy(pDst, pSrc, width * bpp);
		pDst += width * bpp;
		pSrc += stride * bpp;
		}

		if (resize) {
		glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format, type, temp);
		} else {
		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, temp);
		}

		free(temp);
		}
		}

		static void uploadSkBitmapToTexture(const SkBitmap& bitmap,
		bool resize, GLenum format, GLenum type) {
		uploadToTexture(resize, format, type, bitmap.rowBytesAsPixels(), bitmap.bytesPerPixel(),
		bitmap.width(), bitmap.height(), bitmap.getPixels());
		}

		void TextureState::generateTexture(const SkBitmap* bitmap, Texture* texture, bool regenerate) {
		SkAutoLockPixels alp(*bitmap);

		if (!bitmap->readyToDraw()) {
		ALOGE("Cannot generate texture from bitmap");
		return;
		}

		ATRACE_FORMAT("Upload %ux%u Texture", bitmap->width(), bitmap->height());

		// We could also enable mipmapping if both bitmap dimensions are powers
		// of 2 but we'd have to deal with size changes. Let's keep this simple
		const bool canMipMap = Caches::getInstance().extensions().hasNPot();

		// If the texture had mipmap enabled but not anymore,
		// force a glTexImage2D to discard the mipmap levels
		const bool resize = !regenerate \|\| bitmap->width() != int(texture->width) \|\|
		bitmap->height() != int(texture->height) \|\|
		(regenerate && canMipMap && texture->mipMap && !bitmap->hasHardwareMipMap());

		if (!regenerate) {
		glGenTextures(1, &texture->id);
		}

		texture->generation = bitmap->getGenerationID();
		texture->width = bitmap->width();
		texture->height = bitmap->height();

		bindTexture(texture->id);

		switch (bitmap->colorType()) {
		case kAlpha_8_SkColorType:
		uploadSkBitmapToTexture(*bitmap, resize, GL_ALPHA, GL_UNSIGNED_BYTE);
		texture->blend = true;
		break;
		case kRGB_565_SkColorType:
		uploadSkBitmapToTexture(*bitmap, resize, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
		texture->blend = false;
		break;
		case kN32_SkColorType:
		uploadSkBitmapToTexture(*bitmap, resize, GL_RGBA, GL_UNSIGNED_BYTE);
		// Do this after calling getPixels() to make sure Skia's deferred
		// decoding happened
		texture->blend = !bitmap->isOpaque();
		break;
		case kARGB_4444_SkColorType:
		case kIndex_8_SkColorType: {
		SkBitmap rgbaBitmap;
		rgbaBitmap.allocPixels(SkImageInfo::MakeN32(texture->width, texture->height,
		bitmap->alphaType()));
		rgbaBitmap.eraseColor(0);

		SkCanvas canvas(rgbaBitmap);
		canvas.drawBitmap(*bitmap, 0.0f, 0.0f, nullptr);

		uploadSkBitmapToTexture(rgbaBitmap, resize, GL_RGBA, GL_UNSIGNED_BYTE);
		texture->blend = !bitmap->isOpaque();
		break;
		}
		default:
		ALOGW("Unsupported bitmap colorType: %d", bitmap->colorType());
		break;
		}

		if (canMipMap) {
		texture->mipMap = bitmap->hasHardwareMipMap();
		if (texture->mipMap) {
		glGenerateMipmap(GL_TEXTURE_2D);
		}
		}

		if (!regenerate) {
		texture->setFilter(GL_NEAREST);
		texture->setWrap(GL_CLAMP_TO_EDGE);
		}
		}

		TextureState::TextureState()
		: mTextureUnit(0) {
		glActiveTexture(kTextureUnits[0]);

libs/hwui/renderstate/TextureState.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -23,9 +23,13 @@
		#include <SkXfermode.h>
		#include <memory>

		class SkBitmap;

		namespace android {
		namespace uirenderer {

		class Texture;

		class TextureState {
		friend class Caches; // TODO: move to RenderState
		public:
		@@ -71,6 +75,14 @@ public:
		* Clear the cache of bound textures.
		*/
		void unbindTexture(GLuint texture);

		/**
		* Generates the texture from a bitmap into the specified texture structure.
		*
		* @param regenerate If true, the bitmap data is reuploaded into the texture, but
		* no new texture is generated.
		*/
		void generateTexture(const SkBitmap* bitmap, Texture* texture, bool regenerate);
		private:
		// total number of texture units available for use
		static const int kTextureUnitsCount = 4;