Mesa (master): egl/dri2: Properly dereference array.

Matt Turner mattst88 at kemper.freedesktop.org
Wed Oct 7 18:48:28 UTC 2015


Module: Mesa
Branch: master
Commit: 164c8277f0edaab64e3cea43a1cf943ace62b21b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=164c8277f0edaab64e3cea43a1cf943ace62b21b

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Oct  7 11:43:58 2015 -0700

egl/dri2: Properly dereference array.

Fixes a regression that broke EGL since

commit 858f2f2ae6d72f338fdd6d544b0c733814e22724
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sun Sep 13 12:25:27 2015 +0100

    egl/dri2: ease srgb __DRIconfig conditionals

---

 src/egl/drivers/dri2/egl_dri2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 229285f..4cc5f23 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1010,10 +1010,10 @@ dri2_create_context(_EGLDriver *drv, _EGLDisplay *disp, _EGLConfig *conf,
        * doubleBufferMode check in
        * src/mesa/main/context.c:check_compatible()
        */
-      if (dri2_config->dri_double_config)
-         dri_config = dri2_config->dri_double_config;
+      if (dri2_config->dri_double_config[0])
+         dri_config = dri2_config->dri_double_config[0];
       else
-         dri_config = dri2_config->dri_single_config;
+         dri_config = dri2_config->dri_single_config[0];
 
       /* EGL_WINDOW_BIT is set only when there is a dri_double_config.  This
        * makes sure the back buffer will always be used.




More information about the mesa-commit mailing list