diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-21 17:07:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 17:07:15 -0700 |
| commit | 613493c424a8d62ecbcd7b90cb1008d569e93746 (patch) | |
| tree | 16d550976076f0294750952e0cc42d55b9a64ea4 /opengl | |
| parent | fb0163b8d06c2686e8de2d950af8bf34b46f3e30 (diff) | |
| parent | 878353fb0bab1b22197b387f3adae98136a1ab49 (diff) | |
| download | frameworks_native-613493c424a8d62ecbcd7b90cb1008d569e93746.zip frameworks_native-613493c424a8d62ecbcd7b90cb1008d569e93746.tar.gz frameworks_native-613493c424a8d62ecbcd7b90cb1008d569e93746.tar.bz2 | |
am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp
* commit 'aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
fix [3119687] [Maps][4.6.0] Force close in street view
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 20560c8..1555801 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -996,8 +996,8 @@ static config_pair_t const config_4_attribute_list[] = { { EGL_GREEN_SIZE, 8 }, { EGL_RED_SIZE, 8 }, { EGL_DEPTH_SIZE, 0 }, - { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBA_8888 }, { EGL_CONFIG_ID, 2 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBA_8888 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -1033,8 +1033,8 @@ static config_pair_t const config_7_attribute_list[] = { { EGL_GREEN_SIZE, 0 }, { EGL_RED_SIZE, 0 }, { EGL_DEPTH_SIZE, 16 }, - { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_A_8 }, { EGL_CONFIG_ID, 5 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_A_8 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; |