summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2009-12-04 04:28:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-04 04:28:12 -0800
commit1d51165f49872f2e7f352c1ed51aa7c4d076338e (patch)
tree4569a29d14211ee4265fa2a9486c4af52250f4f4
parent8bf73ff274800ce75a222cd9693e733cbd821aaf (diff)
parent20208ff643b33956c93d1f3fa1fa2c2d06fc7d02 (diff)
downloadframeworks_base-1d51165f49872f2e7f352c1ed51aa7c4d076338e.zip
frameworks_base-1d51165f49872f2e7f352c1ed51aa7c4d076338e.tar.gz
frameworks_base-1d51165f49872f2e7f352c1ed51aa7c4d076338e.tar.bz2
am 20208ff6: am 9b565d5b: am cef8d031: Merge change I00d0b54a into eclair
Merge commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02' * commit '20208ff643b33956c93d1f3fa1fa2c2d06fc7d02': surfaceflinger: remove un-cached buffer hack for SGX
-rw-r--r--libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
index 79c003f..d9d9bfe 100644
--- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp
@@ -246,8 +246,7 @@ void DisplayHardware::init(uint32_t dpy)
LOGI("version : %s", glGetString(GL_VERSION));
LOGI("extensions: %s", gl_extensions);
- if (strstr(gl_renderer, "PowerVR SGX 530") ||
- strstr(gl_renderer, "Adreno")) {
+ if (strstr(gl_renderer, "Adreno")) {
LOGD("Assuming uncached graphics buffers.");
mFlags &= ~CACHED_BUFFERS;
}