drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Textured text calls could be invisible Bug #6597730" into jb-dev

Browse Source
This commit is contained in:
Romain Guy
2012-06-11 17:31:44 -07:00
committed by Android (Google) Code Review
parent 78a9b67691 16c8808525
commit 68cefd2018
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/FontRenderer.cpp
View File

@ -598,6 +598,7 @@ void FontRenderer::allocateTextureMemory(CacheTexture* cacheTexture) {
glGenTextures(1, &cacheTexture->mTextureId); glGenTextures(1, &cacheTexture->mTextureId);
} }
Caches::getInstance().activeTexture(0);
glBindTexture(GL_TEXTURE_2D, cacheTexture->mTextureId); glBindTexture(GL_TEXTURE_2D, cacheTexture->mTextureId);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
// Initialize texture dimensions // Initialize texture dimensions
@ -826,6 +827,7 @@ void FontRenderer::checkTextureUpdate() {
} }
} }
caches.activeTexture(0);
glBindTexture(GL_TEXTURE_2D, mCurrentCacheTexture->mTextureId); glBindTexture(GL_TEXTURE_2D, mCurrentCacheTexture->mTextureId);
if (mLinearFiltering != mCurrentCacheTexture->mLinearFiltering) { if (mLinearFiltering != mCurrentCacheTexture->mLinearFiltering) {
const GLenum filtering = mLinearFiltering ? GL_LINEAR : GL_NEAREST; const GLenum filtering = mLinearFiltering ? GL_LINEAR : GL_NEAREST;

3
libs/hwui/OpenGLRenderer.cpp
View File

@ -2422,6 +2422,7 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count,
linearFilter = fabs(y - (int) y) > 0.0f || fabs(x - (int) x) > 0.0f; linearFilter = fabs(y - (int) y) > 0.0f || fabs(x - (int) x) > 0.0f;
} }
// The font renderer will always use texture unit 0
mCaches.activeTexture(0); mCaches.activeTexture(0);
setupDraw(); setupDraw();
setupDrawDirtyRegionsDisabled(); setupDrawDirtyRegionsDisabled();
@ -2432,6 +2433,8 @@ status_t OpenGLRenderer::drawText(const char* text, int bytesCount, int count,
setupDrawBlending(true, mode); setupDrawBlending(true, mode);
setupDrawProgram(); setupDrawProgram();
setupDrawModelView(x, y, x, y, pureTranslate, true); setupDrawModelView(x, y, x, y, pureTranslate, true);
// See comment above; the font renderer must use texture unit 0
// assert(mTextureUnit == 0)
setupDrawTexture(fontRenderer.getTexture(linearFilter)); setupDrawTexture(fontRenderer.getTexture(linearFilter));
setupDrawPureColorUniforms(); setupDrawPureColorUniforms();
setupDrawColorFilterUniforms(); setupDrawColorFilterUniforms();