From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 9 Feb 2017 13:35:44 +0000 (+0000)
Subject: glx: remove always true ifdef guards
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=404a5ca088773063da5a3dce359de19a0231b8fb;p=mesa.git

glx: remove always true ifdef guards

The two symbols referenced were introduced with v2.2 and 2.3 of
the dri2proto package and we require dri2proto >= 2.6.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index 9ebd00ac849..f7e613388a6 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -94,7 +94,6 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
 
    switch ((wire->u.u.type & 0x7f) - info->codes->first_event) {
 
-#ifdef X_DRI2SwapBuffers
    case DRI2_BufferSwapComplete:
    {
       GLXBufferSwapComplete *aevent = (GLXBufferSwapComplete *)event;
@@ -143,8 +142,6 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
 
       return True;
    }
-#endif
-#ifdef DRI2_InvalidateBuffers
    case DRI2_InvalidateBuffers:
    {
       xDRI2InvalidateBuffers *awire = (xDRI2InvalidateBuffers *)wire;
@@ -152,7 +149,6 @@ DRI2WireToEvent(Display *dpy, XEvent *event, xEvent *wire)
       dri2InvalidateBuffers(dpy, awire->drawable);
       return False;
    }
-#endif
    default:
       /* client doesn't support server event */
       break;