Merge "Free up resources by deleting shaders early on" (ee698a01) · Commits · e / os / android_frameworks_base

libs/hwui/Program.cpp

+40 −28

Original line number	Original line	Diff line number	Diff line
	@@ -27,35 +27,45 @@ namespace uirenderer {

	Program::Program(const char* vertex, const char* fragment) {		Program::Program(const char* vertex, const char* fragment) {
	mInitialized = false;		mInitialized = false;
			mHasColorUniform = false;

	vertexShader = buildShader(vertex, GL_VERTEX_SHADER);		GLuint vertexShader = buildShader(vertex, GL_VERTEX_SHADER);
	if (vertexShader) {		if (vertexShader) {

	fragmentShader = buildShader(fragment, GL_FRAGMENT_SHADER);		GLuint fragmentShader = buildShader(fragment, GL_FRAGMENT_SHADER);
	if (fragmentShader) {		if (fragmentShader) {

	id = glCreateProgram();		mProgramId = glCreateProgram();
	glAttachShader(id, vertexShader);		glAttachShader(mProgramId, vertexShader);
	glAttachShader(id, fragmentShader);		glAttachShader(mProgramId, fragmentShader);
	glLinkProgram(id);		glLinkProgram(mProgramId);

	GLint status;		GLint status;
	glGetProgramiv(id, GL_LINK_STATUS, &status);		glGetProgramiv(mProgramId, GL_LINK_STATUS, &status);
	if (status != GL_TRUE) {		if (status != GL_TRUE) {
	LOGE("Error while linking shaders:");		LOGE("Error while linking shaders:");
	GLint infoLen = 0;		GLint infoLen = 0;
	glGetProgramiv(id, GL_INFO_LOG_LENGTH, &infoLen);		glGetProgramiv(mProgramId, GL_INFO_LOG_LENGTH, &infoLen);
	if (infoLen > 1) {		if (infoLen > 1) {
	GLchar log[infoLen];		GLchar log[infoLen];
	glGetProgramInfoLog(id, infoLen, 0, &log[0]);		glGetProgramInfoLog(mProgramId, infoLen, 0, &log[0]);
	LOGE("%s", log);		LOGE("%s", log);
	}		}
	glDeleteShader(vertexShader);
	glDeleteShader(fragmentShader);
	glDeleteProgram(id);
	} else {		} else {
	mInitialized = true;		mInitialized = true;
	}		}

			glDetachShader(mProgramId, vertexShader);
			glDetachShader(mProgramId, fragmentShader);

			glDeleteShader(vertexShader);
			glDeleteShader(fragmentShader);

			if (!mInitialized) {
			glDeleteProgram(mProgramId);
			}
			} else {
			glDeleteShader(vertexShader);
	}		}
	}		}

	@@ -69,36 +79,34 @@ Program::Program(const char* vertex, const char* fragment) {

	Program::~Program() {		Program::~Program() {
	if (mInitialized) {		if (mInitialized) {
	glDeleteShader(vertexShader);		glDeleteProgram(mProgramId);
	glDeleteShader(fragmentShader);
	glDeleteProgram(id);
	}		}
	}		}

	int Program::addAttrib(const char* name) {		int Program::addAttrib(const char* name) {
	int slot = glGetAttribLocation(id, name);		int slot = glGetAttribLocation(mProgramId, name);
	attributes.add(name, slot);		mAttributes.add(name, slot);
	return slot;		return slot;
	}		}

	int Program::getAttrib(const char* name) {		int Program::getAttrib(const char* name) {
	ssize_t index = attributes.indexOfKey(name);		ssize_t index = mAttributes.indexOfKey(name);
	if (index >= 0) {		if (index >= 0) {
	return attributes.valueAt(index);		return mAttributes.valueAt(index);
	}		}
	return addAttrib(name);		return addAttrib(name);
	}		}

	int Program::addUniform(const char* name) {		int Program::addUniform(const char* name) {
	int slot = glGetUniformLocation(id, name);		int slot = glGetUniformLocation(mProgramId, name);
	uniforms.add(name, slot);		mUniforms.add(name, slot);
	return slot;		return slot;
	}		}

	int Program::getUniform(const char* name) {		int Program::getUniform(const char* name) {
	ssize_t index = uniforms.indexOfKey(name);		ssize_t index = mUniforms.indexOfKey(name);
	if (index >= 0) {		if (index >= 0) {
	return uniforms.valueAt(index);		return mUniforms.valueAt(index);
	}		}
	return addUniform(name);		return addUniform(name);
	}		}
	@@ -140,20 +148,24 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix,
	}		}

	void Program::setColor(const float r, const float g, const float b, const float a) {		void Program::setColor(const float r, const float g, const float b, const float a) {
	glUniform4f(getUniform("color"), r, g, b, a);		if (!mHasColorUniform) {
			mColorUniform = getUniform("color");
			mHasColorUniform = false;
			}
			glUniform4f(mColorUniform, r, g, b, a);
	}		}

	void Program::use() {		void Program::use() {
	glUseProgram(id);		glUseProgram(mProgramId);
	mUse = true;		mUse = true;

	glEnableVertexAttribArray(position);		glEnableVertexAttribArray(position);
	}		}

	void Program::remove() {		void Program::remove() {
	mUse = false;		mUse = false;
			// TODO: Is this necessary? It should not be since all of our shaders
	glDisableVertexAttribArray(position);		// use slot 0 for the position attrib
			// glDisableVertexAttribArray(position);
	}		}

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

libs/hwui/Program.h

+6 −7

Original line number	Original line	Diff line number	Diff line
	@@ -122,18 +122,17 @@ private:
	GLuint buildShader(const char* source, GLenum type);		GLuint buildShader(const char* source, GLenum type);

	// Name of the OpenGL program		// Name of the OpenGL program
	GLuint id;		GLuint mProgramId;

	// Name of the shaders
	GLuint vertexShader;
	GLuint fragmentShader;

	// Keeps track of attributes and uniforms slots		// Keeps track of attributes and uniforms slots
	KeyedVector<const char*, int> attributes;		KeyedVector<const char*, int> mAttributes;
	KeyedVector<const char*, int> uniforms;		KeyedVector<const char*, int> mUniforms;

	bool mUse;		bool mUse;
	bool mInitialized;		bool mInitialized;

			bool mHasColorUniform;
			int mColorUniform;
	}; // class Program		}; // class Program

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

libs/hwui/Properties.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ enum DebugLevel {
	#define PROPERTY_TEXT_WHITE_GAMMA_THRESHOLD "ro.text_gamma.white_threshold"		#define PROPERTY_TEXT_WHITE_GAMMA_THRESHOLD "ro.text_gamma.white_threshold"

	// Converts a number of mega-bytes into bytes		// Converts a number of mega-bytes into bytes
	#define MB(s) s * 1024 * 1024		#define MB(s) (s * 1024 * 1024)

	#define DEFAULT_TEXTURE_CACHE_SIZE 24.0f		#define DEFAULT_TEXTURE_CACHE_SIZE 24.0f
	#define DEFAULT_LAYER_CACHE_SIZE 16.0f		#define DEFAULT_LAYER_CACHE_SIZE 16.0f