diff options
author | Mathias Agopian <mathias@google.com> | 2010-10-20 18:00:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-20 18:00:43 -0700 |
commit | 6d44a8718a9edce778aae87363b36e039c9dcfa7 (patch) | |
tree | c0914ee15fdad775c1da2aadfc7916a4698347b7 /opengl/libagl | |
parent | b56d2f1a469f074dfc90871a8598169b863fce13 (diff) | |
parent | d8e5ceb963c9bd3cba5c307aef481ded7859ef79 (diff) | |
download | frameworks_native-6d44a8718a9edce778aae87363b36e039c9dcfa7.zip frameworks_native-6d44a8718a9edce778aae87363b36e039c9dcfa7.tar.gz frameworks_native-6d44a8718a9edce778aae87363b36e039c9dcfa7.tar.bz2 |
Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread
Diffstat (limited to 'opengl/libagl')
-rw-r--r-- | opengl/libagl/egl.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 3fb322a..1ea8d06 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -947,6 +947,7 @@ static config_pair_t const config_0_attribute_list[] = { { EGL_RED_SIZE, 5 }, { EGL_DEPTH_SIZE, 0 }, { EGL_CONFIG_ID, 0 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGB_565 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -958,6 +959,7 @@ static config_pair_t const config_1_attribute_list[] = { { EGL_RED_SIZE, 5 }, { EGL_DEPTH_SIZE, 16 }, { EGL_CONFIG_ID, 1 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGB_565 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -970,6 +972,7 @@ static config_pair_t const config_2_attribute_list[] = { { EGL_RED_SIZE, 8 }, { EGL_DEPTH_SIZE, 0 }, { EGL_CONFIG_ID, 6 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBX_8888 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -981,6 +984,7 @@ static config_pair_t const config_3_attribute_list[] = { { EGL_RED_SIZE, 8 }, { EGL_DEPTH_SIZE, 16 }, { EGL_CONFIG_ID, 7 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBX_8888 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -992,6 +996,7 @@ 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_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -1004,6 +1009,7 @@ static config_pair_t const config_5_attribute_list[] = { { EGL_RED_SIZE, 8 }, { EGL_DEPTH_SIZE, 16 }, { EGL_CONFIG_ID, 3 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_RGBA_8888 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -1016,6 +1022,7 @@ static config_pair_t const config_6_attribute_list[] = { { EGL_RED_SIZE, 0 }, { EGL_DEPTH_SIZE, 0 }, { EGL_CONFIG_ID, 4 }, + { EGL_NATIVE_VISUAL_ID, GGL_PIXEL_FORMAT_A_8 }, { EGL_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; @@ -1026,6 +1033,7 @@ 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_SURFACE_TYPE, EGL_WINDOW_BIT|EGL_PBUFFER_BIT|EGL_PIXMAP_BIT }, }; |