projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd1ebd8)
vl: remove DRI2DriverPrimeShift compile guards
authorEmil Velikov <emil.velikov@collabora.com>
Thu, 9 Feb 2017 13:35:47 +0000 (13:35 +0000)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 13 Feb 2017 10:13:29 +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/gallium/auxiliary/vl/vl_winsys_dri.c patch | blob | history

diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index 4d65bb1a1e82d08c937c8ea123bc8527d35a6042..b4fb47ea8e46243c8ac99f75e6227f1131596307 100644 (file)
--- 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,