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

glx: remove DRI2DriverPrimeShift compile guards

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>
---

diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index f7e613388a6..f00b96525aa 100644
--- a/src/glx/dri2.c
+++ b/src/glx/dri2.c
@@ -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);