am ec5acee1: Merge "workaround to unbreak the build (deadlock during boot)" into jb-mr1-dev

* commit 'ec5acee17a2210c3abcb25406c087901fda77757':
  workaround to unbreak the build (deadlock during boot)
This commit is contained in:
Romain Guy
2012-10-16 21:40:18 -07:00
committed by Android Git Automerger

View File

@@ -75,7 +75,7 @@ void TextureCache::init() {
mDebugEnabled = readDebugLevel() & kDebugCaches;
mHasNPot = Caches::getInstance().extensions.hasNPot();
mHasNPot = false; //Caches::getInstance().extensions.hasNPot();
}
///////////////////////////////////////////////////////////////////////////////