Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / egl / main / eglconfig.c

diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 2c8d1c4055bf475ff57bab49357da9d9f6ff6d40..31d69a770808e2463f87908c117a6fd3335630c3 100644 (file)
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -82,18 +82,17 @@ _eglAddConfig(_EGLDisplay *dpy, _EGLConfig *conf)
 EGLBoolean
 _eglCheckConfigHandle(EGLConfig config, _EGLDisplay *dpy)
 {
-   _EGLConfig *conf = NULL;
+   EGLint num_configs = (dpy) ? dpy->NumConfigs : 0;
    EGLint i;
 
-   for (i = 0; dpy && i < dpy->NumConfigs; i++) {
-      conf = dpy->Configs[i];
+   for (i = 0; i < num_configs; i++) {
+      _EGLConfig *conf = dpy->Configs[i];
       if (conf == (_EGLConfig *) config) {
          assert(conf->Display == dpy);
          break;
       }
    }
-
-   return (conf != NULL);
+   return (i < num_configs);
 }