glx: remove DRI2DriverPrimeShift compile guards
authorEmil Velikov <emil.velikov@collabora.com>
Thu, 9 Feb 2017 13:35:48 +0000 (13:35 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 13 Feb 2017 10:13:46 +0000 (10:13 +0000)
DRI2DriverPrimeShift was added in dri2proto-2.8, which we now require
as of the previous commit.

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

index f7e613388a67ea961c253cdb21707023ffb689ef..f00b96525aad1c6942ea8ebbfe768a456694260a 100644 (file)
@@ -281,7 +281,6 @@ DRI2Connect(Display * dpy, XID window, char **driverName, char **deviceName)
    req->window = window;
 
    req->driverType = DRI2DriverDRI;
-#ifdef DRI2DriverPrimeShift
    {
       char *prime = getenv("DRI_PRIME");
       if (prime) {
@@ -293,7 +292,6 @@ DRI2Connect(Display * dpy, XID window, char **driverName, char **deviceName)
                ((primeid & DRI2DriverPrimeMask) << DRI2DriverPrimeShift);
       }
    }
-#endif
 
    if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) {
       UnlockDisplay(dpy);