Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't change texture unit when not needed."

Browse Source
This commit is contained in:
Romain Guy
2010-10-25 18:36:13 -07:00
committed by Android (Google) Code Review
parent e6b80989b8 3e3ba155fc
commit 2c94ba7405
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/hwui/OpenGLRenderer.cpp
View File

@@ -1391,16 +1391,19 @@ void OpenGLRenderer::bindTexture(GLuint texture, GLuint textureUnit) {
void OpenGLRenderer::setTextureWrapModes(Texture* texture, GLenum wrapS, GLenum wrapT,
GLuint textureUnit) {
glActiveTexture(gTextureUnits[textureUnit]);
bool bound = false;
if (wrapS != texture->wrapS) {
glActiveTexture(gTextureUnits[textureUnit]);
glBindTexture(GL_TEXTURE_2D, texture->id);
bound = true;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapS);
texture->wrapS = wrapS;
}
if (wrapT != texture->wrapT) {
if (!bound) glBindTexture(GL_TEXTURE_2D, texture->id);
if (!bound) {
glActiveTexture(gTextureUnits[textureUnit]);
glBindTexture(GL_TEXTURE_2D, texture->id);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapT);
texture->wrapT = wrapT;
}