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

Romain Guy · Android (Google) Code Review · commit ec5acee17a22 · 2012-10-16T21:37:07.000-07:00
diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp
@@ -75,7 +75,7 @@ void TextureCache::init() {
 
     mDebugEnabled = readDebugLevel() & kDebugCaches;
 
-    mHasNPot = Caches::getInstance().extensions.hasNPot();
+    mHasNPot = false; //Caches::getInstance().extensions.hasNPot();
 }
 
 ///////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ void TextureCache::init() {`
`75`	`75`
`76`	`76`	`mDebugEnabled = readDebugLevel() & kDebugCaches;`
`77`	`77`
`78`		`- mHasNPot = Caches::getInstance().extensions.hasNPot();`
	`78`	`+ mHasNPot = false; //Caches::getInstance().extensions.hasNPot();`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`///////////////////////////////////////////////////////////////////////////////`