diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-29 14:57:05 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-29 14:57:05 -0700 |
| commit | dee1b302ed9071c634131ae838d6a7de0d7b912e (patch) | |
| tree | f56276c6f991550f3c8ebde1eab0dd8f1e4560d1 /opengl | |
| parent | 9261bae1d2a769cb7453d2cadb6040be38ec86e5 (diff) | |
| parent | 02f54246f55f0ef4263f91062d350876ade5dd78 (diff) | |
| download | frameworks_native-dee1b302ed9071c634131ae838d6a7de0d7b912e.zip frameworks_native-dee1b302ed9071c634131ae838d6a7de0d7b912e.tar.gz frameworks_native-dee1b302ed9071c634131ae838d6a7de0d7b912e.tar.bz2 | |
merge from donut
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 2 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index c44478d..4461567 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -1103,7 +1103,7 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list, // default value if (binarySearch<config_pair_t>( (config_pair_t const*)attrib_list, - 0, numAttributes, + 0, numAttributes-1, config_defaults[j].key) < 0) { for (int i=0 ; i<numConfigs ; i++) { diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index de323b3..c6e0f50 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -799,7 +799,7 @@ EGLBoolean eglChooseConfig( EGLDisplay dpy, const EGLint *attrib_list, EGLint patch_index = -1; GLint attr; size_t size = 0; - while ((attr=attrib_list[size])) { + while ((attr=attrib_list[size]) != EGL_NONE) { if (attr == EGL_CONFIG_ID) patch_index = size; size += 2; |