diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-12-19 21:46:33 +0100 |
| commit | 0f68236a2487dbeb0396b996debcda595b0b54a1 (patch) | |
| tree | 938ae3b779349b6dba6f5a891550604f9a9ca895 /src/egl/main/eglconfig.c | |
| parent | d047168d81cfeb39a98f3ae16416872facc6237c (diff) | |
| parent | 237880463d5168cad8df0bae6018b5fd76617777 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Diffstat (limited to 'src/egl/main/eglconfig.c')
| -rw-r--r-- | src/egl/main/eglconfig.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index fec94fb20c..5b377b7f61 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -697,11 +697,22 @@ _eglChooseConfig(_EGLDriver *drv, _EGLDisplay *disp, const EGLint *attrib_list, if (!_eglParseConfigAttribList(&criteria, disp, attrib_list)) return _eglError(EGL_BAD_ATTRIBUTE, "eglChooseConfig"); - configList = (_EGLConfig **) _eglFilterArray(disp->Configs, &count, + /* get the number of matched configs */ + count = _eglFilterArray(disp->Configs, NULL, 0, (_EGLArrayForEach) _eglMatchConfig, (void *) &criteria); + if (!count) { + *num_configs = count; + return EGL_TRUE; + } + + configList = malloc(sizeof(*configList) * count); if (!configList) return _eglError(EGL_BAD_ALLOC, "eglChooseConfig(out of memory)"); + /* get the matched configs */ + _eglFilterArray(disp->Configs, (void **) configList, count, + (_EGLArrayForEach) _eglMatchConfig, (void *) &criteria); + /* perform sorting of configs */ if (configs && count) { _eglSortConfigs((const _EGLConfig **) configList, count, |