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

Merge change Ic73ec39b into eclair

Browse Source 
* changes:
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.
This commit is contained in:
Android (Google) Code Review
2009-12-03 16:15:46 -08:00
parent 5d0806c9c3 c73ec39bd0
commit 5c49a9080d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/rs/rsProgramFragment.cpp
View File

@@ -65,6 +65,20 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state)
} }
glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable); glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable);
} }
rsAssert(mTextures[ct]->getTextureID() != 0);
if (mTextures[ct]->getTextureID() == 0) {
// This is a hack for eclair to try to fix the white squares bug.
Allocation *a = (Allocation *)mTextures[ct].get();
a->uploadToTexture((Context *)rsc, 0);
if (mTextures[ct]->getTextureID() == 0) {
// At this point we are screwed. Crash to restart the app.
rsc->dumpDebug();
LOGE("Multiple failures during texture upload. Driver appears wedged.");
((char *)0)[0] = 0;
}
}
glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID());
switch(mEnvModes[ct]) { switch(mEnvModes[ct]) {