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

vl: 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/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index 4d65bb1a1e8..b4fb47ea8e4 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c
@@ -363,7 +363,6 @@ vl_dri2_screen_create(Display *display, int screen)
       goto free_query;
 
    driverType = XCB_DRI2_DRIVER_TYPE_DRI;
-#ifdef DRI2DriverPrimeShift
    {
       char *prime = getenv("DRI_PRIME");
       if (prime) {
@@ -375,7 +374,6 @@ vl_dri2_screen_create(Display *display, int screen)
                ((primeid & DRI2DriverPrimeMask) << DRI2DriverPrimeShift);
       }
    }
-#endif
 
    connect_cookie = xcb_dri2_connect_unchecked(scrn->conn,
                                                xcb_screen->root,