Skip to content
Snippets Groups Projects
Commit dd7b6670 authored by Emil Velikov's avatar Emil Velikov
Browse files

auxiliary/vl: Build vl_winsys_dri.c only when needed.


With commit c39dbfdd(auxiliary/vl: bring back the VL code for the dri
targets) we did not fully consider users of dri-swrast alone. Thus we
ended up trying to compile the dri2 specific code on platform which lack
it - Cygwin for example.

Cc: "10.5" <mesa-stable@lists.freedesktop.org>
Reported-by: default avatarJon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarJon TURNEY <jon.turney@dronecode.org.uk>
parent 3018c4a5
No related branches found
No related tags found
Loading
......@@ -1577,11 +1577,19 @@ if test "x$enable_dri" = xyes -o \
"x$enable_vdpau" = xyes -o \
"x$enable_omx" = xyes -o \
"x$enable_va" = xyes; then
PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
need_gallium_vl=yes
fi
AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes)
if test "x$enable_xvmc" = xyes -o \
"x$enable_vdpau" = xyes -o \
"x$enable_omx" = xyes -o \
"x$enable_va" = xyes; then
PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED])
need_gallium_vl_winsys=yes
fi
AM_CONDITIONAL(NEED_GALLIUM_VL_WINSYS, test "x$need_gallium_vl_winsys" = xyes)
if test "x$enable_xvmc" = xyes; then
PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED])
enable_gallium_loader=$enable_shared_pipe_drivers
......
......@@ -74,6 +74,8 @@ libgalliumvl_la_CFLAGS = \
libgalliumvl_la_SOURCES = \
$(VL_SOURCES)
if NEED_GALLIUM_VL_WINSYS
noinst_LTLIBRARIES += libgalliumvlwinsys.la
libgalliumvlwinsys_la_CFLAGS = \
......@@ -84,6 +86,8 @@ libgalliumvlwinsys_la_SOURCES = \
endif
endif
EXTRA_DIST = \
SConscript \
indices/u_indices.c \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment