Mesa (master): glx: remove DRI2DriverPrimeShift compile guards

Emil Velikov evelikov at kemper.freedesktop.org
Mon Feb 13 10:18:55 UTC 2017


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

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Feb  9 13:35:48 2017 +0000

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 at collabora.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/glx/dri2.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/glx/dri2.c b/src/glx/dri2.c
index f7e6133..f00b965 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);




More information about the mesa-commit mailing list