diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-06 23:47:08 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-07 15:07:52 -0700 |
| commit | 927d37cb788670b91af0f1a7a93c68046a838d23 (patch) | |
| tree | acde612e9c88b5334646d552fdbb881495454f8a | |
| parent | 2e20bffbab8084fedce39d14d7dd17b08f6e9ba2 (diff) | |
| download | frameworks_base-927d37cb788670b91af0f1a7a93c68046a838d23.zip frameworks_base-927d37cb788670b91af0f1a7a93c68046a838d23.tar.gz frameworks_base-927d37cb788670b91af0f1a7a93c68046a838d23.tar.bz2 | |
fix EGL extension string names
| -rw-r--r-- | libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp | 4 | ||||
| -rw-r--r-- | opengl/libagl/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp index fc29d73..31db31f 100644 --- a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -204,7 +204,7 @@ void DisplayHardware::init(uint32_t dpy) } } - if (strstr(egl_extensions, "ANDROID_swap_rectangle")) { + if (strstr(egl_extensions, "EGL_ANDROID_swap_rectangle")) { mFlags |= SWAP_RECTANGLE; } @@ -250,7 +250,7 @@ void DisplayHardware::init(uint32_t dpy) mFlags |= DRAW_TEXTURE_EXTENSION; } if (strstr( gl_extensions, "GL_OES_EGL_image") && - (strstr(egl_extensions, "KHR_image_base") || + (strstr(egl_extensions, "EGL_KHR_image_base") || strstr(egl_extensions, "EGL_KHR_image")) && strstr(egl_extensions, "EGL_ANDROID_image_native_buffer")) { mFlags |= DIRECT_TEXTURE; diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 4cf0bf8..f50257a 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -774,7 +774,7 @@ static char const * const gVendorString = "Google Inc."; static char const * const gVersionString = "1.2 Android Driver"; static char const * const gClientApiString = "OpenGL ES"; static char const * const gExtensionsString = - "KHR_image_base " + "EGL_KHR_image_base " // "KHR_image_pixmap " "EGL_ANDROID_image_native_buffer " "EGL_ANDROID_swap_rectangle " diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 8c37f2e..6c80538 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -57,8 +57,8 @@ static char const * const gVersionString = "1.31 Android META-EGL"; static char const * const gClientApiString = "OpenGL ES"; static char const * const gExtensionString = "EGL_KHR_image " - "KHR_image_base " - "KHR_image_pixmap " + "EGL_KHR_image_base " + "EGL_KHR_image_pixmap " "EGL_ANDROID_image_native_buffer " "EGL_ANDROID_swap_rectangle " ; |