am 46e28db8: Merge change 6713 into donut

Merge commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6'

* commit '46e28db8818332e3cda4cc410cc89a1ed7ce4db6':
  fix for [1969185] valgrind errors in new gl stuff
This commit is contained in:
Android (Google) Code Review
2009-07-09 17:35:26 -07:00
committed by The Android Open Source Project
2 changed files with 2 additions and 2 deletions

View File

@@ -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++) {

View File

@@ -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;