Mesa (master): glx: Fix SwapBuffers regression introduced by 01923fb72d.

Keith Whitwell keithw at kemper.freedesktop.org
Mon Feb 8 23:29:28 UTC 2010


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

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Mon Feb  8 23:15:03 2010 +0100

glx: Fix SwapBuffers regression introduced by 01923fb72d.

After that commit, some dri2 protocol symbols were being checked from
places that weren't including dri2proto.h, effectively disabling some
valuable SwapBuffers codepaths.

---

 src/glx/x11/dri2_glx.c |    1 +
 src/glx/x11/glxext.c   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 6200df9..15a3ea5 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -37,6 +37,7 @@
 #include <X11/extensions/Xdamage.h>
 #include "glapi.h"
 #include "glxclient.h"
+#include <X11/extensions/dri2proto.h>
 #include "xf86dri.h"
 #include <dlfcn.h>
 #include <fcntl.h>
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index dde694b..c2de1a3 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -41,6 +41,7 @@
 #include "glxclient.h"
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
+#include <X11/extensions/dri2proto.h>
 #include "glxextensions.h"
 #include "glcontextmodes.h"
 




More information about the mesa-commit mailing list