am 160e97cb: am c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes.

Merge commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e' into eclair-mr2-plus-aosp

* commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e':
  temporarily disable the use of glTexImage2D for sw buffers on sholes.
This commit is contained in:
Mathias Agopian
2009-10-06 19:27:56 -07:00
committed by Android Git Automerger

View File

@@ -246,10 +246,10 @@ 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")) {
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;
} }