Mesa (master): glx: Use GLX_BufferSwapComplete unconditionally, we require glproto 1.4.11

Kristian Høgsberg krh at kemper.freedesktop.org
Tue Sep 7 18:34:03 UTC 2010


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

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Tue Sep  7 14:18:01 2010 -0400

glx: Use GLX_BufferSwapComplete unconditionally, we require glproto 1.4.11

---

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

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 7d6b986..c5e9d05 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -130,16 +130,6 @@ __glXWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
       aevent->count = awire->count;
       return True;
    }
-   /* No easy symbol to test for this, as GLX_BufferSwapComplete is
-    * defined in the local glx.h header, but the
-    * xGLXBufferSwapComplete typedef is only available in new versions
-    * of the external glxproto.h header, which doesn't have any
-    * testable versioning define.
-    *
-    * I'll use the related DRI2 define, in the hope that we won't
-    * receive these events unless we know how to ask for them:
-    */
-#ifdef X_DRI2SwapBuffers
    case GLX_BufferSwapComplete:
    {
       GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
@@ -151,7 +141,6 @@ __glXWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
       aevent->sbc = ((CARD64)awire->sbc_hi << 32) | awire->sbc_lo;
       return True;
    }
-#endif
    default:
       /* client doesn't support server event */
       break;




More information about the mesa-commit mailing list