diff options
author | Jose Fonseca <jfonseca@vmware.com> | 2016-05-16 21:46:58 +0100 |
---|---|---|
committer | Jose Fonseca <jfonseca@vmware.com> | 2016-05-16 21:50:43 +0100 |
commit | cf010de6ee1b409d97f751705e5d8b26424cf025 (patch) | |
tree | 460c1ead72c86afbfa193c91c6ab1b3138e926f3 | |
parent | 5e2072c711c13244987878117a834ae60ccb4413 (diff) | |
download | external_mesa3d-cf010de6ee1b409d97f751705e5d8b26424cf025.zip external_mesa3d-cf010de6ee1b409d97f751705e5d8b26424cf025.tar.gz external_mesa3d-cf010de6ee1b409d97f751705e5d8b26424cf025.tar.bz2 |
vl/dri: Move the DRI3 check out of sources include into C.
Fixes SCons build.
Trivial. Built locally with SCons and autotools.
-rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 6 | ||||
-rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri3.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 44b3fec..9b0c9a3 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -352,13 +352,9 @@ VL_SOURCES := \ # XXX: Nuke this as our dri targets no longer depend on VL. VL_WINSYS_SOURCES := \ vl/vl_winsys_dri.c \ + vl/vl_winsys_dri3.c \ vl/vl_winsys_drm.c -if HAVE_DRI3 -VL_WINSYS_SOURCES += \ - vl/vl_winsys_dri3.c -endif - VL_STUB_SOURCES := \ vl/vl_stubs.c diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c index c69e677..e438db3 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c @@ -25,6 +25,8 @@ * **************************************************************************/ +#if defined(HAVE_DRI3) + #include <fcntl.h> #include <X11/Xlib-xcb.h> @@ -704,3 +706,5 @@ free_screen: FREE(scrn); return NULL; } + +#endif // defined(HAVE_DRI3) |