am cc96ede2: am 20aec2dd: Merge change I830df4b1 into eclair

Merge commit 'cc96ede29a0844b2bdc5174e8bc5d156b589bd4f' into eclair-mr2-plus-aosp

* commit 'cc96ede29a0844b2bdc5174e8bc5d156b589bd4f':
  addresses several bugs: 2206097, 2166583, 2261119, 2216759
This commit is contained in:
Mathias Agopian
2009-11-14 01:09:02 -08:00
committed by Android Git Automerger

View File

@ -246,10 +246,12 @@ void DisplayHardware::init(uint32_t dpy)
LOGI("version : %s", glGetString(GL_VERSION)); LOGI("version : %s", glGetString(GL_VERSION));
LOGI("extensions: %s", gl_extensions); LOGI("extensions: %s", gl_extensions);
if (strstr(gl_renderer, "PowerVR SGX 530")) { if (strstr(gl_renderer, "PowerVR SGX 530") ||
strstr(gl_renderer, "Adreno")) {
LOGD("Assuming uncached graphics buffers."); LOGD("Assuming uncached graphics buffers.");
mFlags &= ~CACHED_BUFFERS; mFlags &= ~CACHED_BUFFERS;
} }
if (strstr(gl_extensions, "GL_ARB_texture_non_power_of_two")) { if (strstr(gl_extensions, "GL_ARB_texture_non_power_of_two")) {
mFlags |= NPOT_EXTENSION; mFlags |= NPOT_EXTENSION;
} }