diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-09 17:35:26 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-09 17:35:26 -0700 |
| commit | 2eedb2515b733aaba0a92944def8156ef379e0da (patch) | |
| tree | 7ca9a803e0ed78b439d3fa66e9087bf2d749da02 | |
| parent | e7622f3901234f238677c696a31c37838d315e6d (diff) | |
| parent | 46e28db8818332e3cda4cc410cc89a1ed7ce4db6 (diff) | |
| download | frameworks_base-2eedb2515b733aaba0a92944def8156ef379e0da.zip frameworks_base-2eedb2515b733aaba0a92944def8156ef379e0da.tar.gz frameworks_base-2eedb2515b733aaba0a92944def8156ef379e0da.tar.bz2 | |
am 46e28db8: Merge change 6713 into donut
Merge commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6'
* commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6':
fix for [1969185] valgrind errors in new gl stuff
| -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 0fc934f..6f6656a 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -1494,7 +1494,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 004b74a..c2003dd 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -731,7 +731,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; |