diff options
| author | Mathias Agopian <mathias@google.com> | 2010-10-21 17:23:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 17:23:24 -0700 |
| commit | 2e6153ee11fa61d83125bd738a8cc707963a3de6 (patch) | |
| tree | 37a8404b564737b82753e7ad22fe1614b6d6c3d7 /opengl/libagl | |
| parent | 50efa3bc4cd4f7f419d39ce4c999664504d7e4d3 (diff) | |
| parent | 613493c424a8d62ecbcd7b90cb1008d569e93746 (diff) | |
| download | frameworks_native-2e6153ee11fa61d83125bd738a8cc707963a3de6.zip frameworks_native-2e6153ee11fa61d83125bd738a8cc707963a3de6.tar.gz frameworks_native-2e6153ee11fa61d83125bd738a8cc707963a3de6.tar.bz2 | |
am 49af98ed: am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7'
* commit '49af98ed877e8a2db5a6b5be811c798e6f73dff7':
fix [3119687] [Maps][4.6.0] Force close in street view
Diffstat (limited to 'opengl/libagl')
| -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 569cf96..e38b9cc 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 }, }; |