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

Merge "Force-flush state sync on texid change" into lmp-mr1-dev

Browse Source
This commit is contained in:
John Reck
2014-12-11 22:44:18 +00:00
committed by Android (Google) Code Review
parent 63c7b24645 9a7fe1a034
commit b9a4d15d09
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hwui/AssetAtlas.cpp
View File

@ -64,6 +64,12 @@ void AssetAtlas::terminate() {
void AssetAtlas::updateTextureId() { void AssetAtlas::updateTextureId() {
mTexture->id = mImage ? mImage->getTexture() : 0; mTexture->id = mImage ? mImage->getTexture() : 0;
if (mTexture->id) {
// Texture ID changed, force-set to defaults to sync the wrapper & GL
// state objects
mTexture->setWrap(GL_CLAMP_TO_EDGE, false, true);
mTexture->setFilter(GL_NEAREST, false, true);
}
for (size_t i = 0; i < mEntries.size(); i++) { for (size_t i = 0; i < mEntries.size(); i++) {
AssetAtlas::Entry* entry = mEntries.valueAt(i); AssetAtlas::Entry* entry = mEntries.valueAt(i);
entry->texture->id = mTexture->id; entry->texture->id = mTexture->id;