From: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue, 7 Sep 2010 18:18:01 +0000 (-0400)
Subject: glx: Use GLX_BufferSwapComplete unconditionally, we require glproto 1.4.11
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f84d8fab99e10b5575c0f4f93b67846fc1ebad13;p=mesa.git

glx: Use GLX_BufferSwapComplete unconditionally, we require glproto 1.4.11
---

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 7d6b986edd6..c5e9d0510b6 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;