diff options
30 files changed, 52 insertions, 78 deletions
diff --git a/configure.ac b/configure.ac index ac7d49f1f60..1c437e7baaf 100644 --- a/configure.ac +++ b/configure.ac @@ -1844,15 +1844,12 @@ gallium_check_st() { fi if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" - NEED_G3DVL_DRI="yes" fi if test "x$HAVE_ST_VDPAU" = xyes && test "x$6" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" - NEED_G3DVL_DRI="yes" fi if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" - NEED_G3DVL_DRI="yes" fi } @@ -1932,10 +1929,6 @@ if test "x$with_gallium_drivers" != x; then done fi -if test "x$NEED_G3DVL_DRI" = xyes; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS g3dvl/dri" -fi - dnl Tell Automake which drivers to build for driver in $GALLIUM_DRIVERS_DIRS; do case "x$driver" in diff --git a/src/gallium/winsys/g3dvl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h index 174f780001f..5f60d3e7d3b 100644 --- a/src/gallium/winsys/g3dvl/vl_winsys.h +++ b/src/gallium/auxiliary/vl/vl_winsys.h @@ -25,6 +25,12 @@ * **************************************************************************/ +/* + * vl targets use either a dri or sw based winsys backend, so their + * Makefiles directly refer to either vl_winsys_dri.c or vl_winsys_xsp.c. + * Both files implement the interface described in this header. + */ + #ifndef vl_winsys_h #define vl_winsys_h diff --git a/src/gallium/winsys/g3dvl/dri/dri_winsys.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index afaabaaa680..8e4e026a211 100644 --- a/src/gallium/winsys/g3dvl/dri/dri_winsys.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -25,6 +25,8 @@ * **************************************************************************/ +/* directly referenced from target Makefile, because of X dependencies */ + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -44,7 +46,7 @@ #include "util/u_inlines.h" #include "vl/vl_compositor.h" -#include "vl_winsys.h" +#include "vl/vl_winsys.h" struct vl_dri_screen { @@ -305,7 +307,7 @@ vl_screen_create(Display *display, int screen) xcb_screen_iterator_t s; xcb_generic_error_t *error = NULL; char *device_name; - int fd; + int fd, device_name_length; drm_magic_t magic; @@ -336,8 +338,10 @@ vl_screen_create(Display *display, int screen) if (connect == NULL || connect->driver_name_length + connect->device_name_length == 0) goto free_screen; - device_name = xcb_dri2_connect_device_name(connect); - device_name = strndup(device_name, xcb_dri2_connect_device_name_length(connect)); + device_name_length = xcb_dri2_connect_device_name_length(connect); + device_name = CALLOC(1, device_name_length); + memcpy(device_name, xcb_dri2_connect_device_name(connect), device_name_length); + device_name[device_name_length] = 0; fd = open(device_name, O_RDWR); free(device_name); diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/auxiliary/vl/vl_winsys_xsp.c index 1d5d1eaf748..ce3a37f786d 100644 --- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c +++ b/src/gallium/auxiliary/vl/vl_winsys_xsp.c @@ -25,6 +25,8 @@ * **************************************************************************/ +/* directly referenced from target Makefile, because of X dependencies */ + #include <sys/time.h> #include "pipe/p_state.h" @@ -37,7 +39,7 @@ #include "softpipe/sp_public.h" #include "vl/vl_compositor.h" -#include "vl_winsys.h" +#include "vl/vl_winsys.h" struct vl_xsp_screen { diff --git a/src/gallium/state_trackers/va/Makefile b/src/gallium/state_trackers/va/Makefile index 775e4db216d..007d16ff163 100644 --- a/src/gallium/state_trackers/va/Makefile +++ b/src/gallium/state_trackers/va/Makefile @@ -7,9 +7,7 @@ VA_MAJOR = 0 VA_MINOR = 3 LIBRARY_DEFINES = -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(STATE_TRACKER_DEFINES) -LIBRARY_INCLUDES = \ - $(shell $(PKG_CONFIG) --cflags-only-I libva) \ - -I$(TOP)/src/gallium/winsys/g3dvl +LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I libva) C_SOURCES = htab.c \ ftab.c \ diff --git a/src/gallium/state_trackers/va/va_context.c b/src/gallium/state_trackers/va/va_context.c index ea0782f8de1..218677f477c 100644 --- a/src/gallium/state_trackers/va/va_context.c +++ b/src/gallium/state_trackers/va/va_context.c @@ -34,8 +34,7 @@ #include "util/u_debug.h" #include "util/u_memory.h" - -#include "vl_winsys.h" +#include "vl/vl_winsys.h" #include "va_private.h" diff --git a/src/gallium/state_trackers/vdpau/Makefile b/src/gallium/state_trackers/vdpau/Makefile index 0aeadc0b5b0..e9cfc4c0e85 100644 --- a/src/gallium/state_trackers/vdpau/Makefile +++ b/src/gallium/state_trackers/vdpau/Makefile @@ -7,9 +7,7 @@ VDPAU_MAJOR = 1 VDPAU_MINOR = 0 LIBRARY_DEFINES = -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(STATE_TRACKER_DEFINES) -LIBRARY_INCLUDES = \ - $(shell $(PKG_CONFIG) --cflags-only-I vdpau) \ - -I$(TOP)/src/gallium/winsys/g3dvl +LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I vdpau) C_SOURCES = htab.c \ ftab.c \ diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c index 2e38f6cdadb..dd586f52856 100644 --- a/src/gallium/state_trackers/vdpau/device.c +++ b/src/gallium/state_trackers/vdpau/device.c @@ -31,8 +31,6 @@ #include "util/u_debug.h" #include "util/u_sampler.h" -#include "vl_winsys.h" - #include "vdpau_private.h" /** diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c index 2b13ce15487..2281dcfd60f 100644 --- a/src/gallium/state_trackers/vdpau/query.c +++ b/src/gallium/state_trackers/vdpau/query.c @@ -29,7 +29,6 @@ #include <math.h> #include "vdpau_private.h" -#include "vl_winsys.h" #include "pipe/p_screen.h" #include "pipe/p_defines.h" #include "util/u_debug.h" diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index a54fcdcf2ae..918a6c20a09 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -44,8 +44,7 @@ #include "vl/vl_csc.h" #include "vl/vl_matrix_filter.h" #include "vl/vl_median_filter.h" - -#include "vl_winsys.h" +#include "vl/vl_winsys.h" /* Full VDPAU API documentation available at : * ftp://download.nvidia.com/XFree86/vdpau/doxygen/html/index.html */ diff --git a/src/gallium/state_trackers/xvmc/Makefile b/src/gallium/state_trackers/xvmc/Makefile index 179446f5ad5..c54bd7a8433 100644 --- a/src/gallium/state_trackers/xvmc/Makefile +++ b/src/gallium/state_trackers/xvmc/Makefile @@ -3,9 +3,7 @@ include $(TOP)/configs/current LIBNAME = xvmctracker -LIBRARY_INCLUDES = \ - $(shell $(PKG_CONFIG) --cflags-only-I xvmc) \ - -I$(TOP)/src/gallium/winsys/g3dvl +LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I xvmc) C_SOURCES = block.c \ surface.c \ diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c index 7b97a67d662..366f29bcdfa 100644 --- a/src/gallium/state_trackers/xvmc/context.c +++ b/src/gallium/state_trackers/xvmc/context.c @@ -38,7 +38,7 @@ #include "util/u_memory.h" #include "vl/vl_csc.h" -#include "vl_winsys.h" +#include "vl/vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index 058c56816ac..b33f16e6a31 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -39,8 +39,7 @@ #include "util/u_format.h" #include "util/u_sampler.h" #include "util/u_rect.h" - -#include "vl_winsys.h" +#include "vl/vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/state_trackers/xvmc/surface.c b/src/gallium/state_trackers/xvmc/surface.c index 615fd08d2a1..bec23a4a1be 100644 --- a/src/gallium/state_trackers/xvmc/surface.c +++ b/src/gallium/state_trackers/xvmc/surface.c @@ -37,8 +37,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_math.h" - -#include "vl_winsys.h" +#include "vl/vl_winsys.h" #include "xvmc_private.h" diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va index 7215fc3a504..884b59d224e 100644 --- a/src/gallium/targets/Makefile.va +++ b/src/gallium/targets/Makefile.va @@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/auxiliary \ -I$(TOP)/src/gallium/winsys \ - -I$(TOP)/src/gallium/winsys/g3dvl \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(DRIVER_DEFINES) LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lva -lXext -lX11 -lm diff --git a/src/gallium/targets/Makefile.vdpau b/src/gallium/targets/Makefile.vdpau index 2c2385c4f1f..a9e7a9c9549 100644 --- a/src/gallium/targets/Makefile.vdpau +++ b/src/gallium/targets/Makefile.vdpau @@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/auxiliary \ -I$(TOP)/src/gallium/winsys \ - -I$(TOP)/src/gallium/winsys/g3dvl \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(DRIVER_DEFINES) LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc index 5eafe9836e1..217481e48e8 100644 --- a/src/gallium/targets/Makefile.xvmc +++ b/src/gallium/targets/Makefile.xvmc @@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/auxiliary \ -I$(TOP)/src/gallium/winsys \ - -I$(TOP)/src/gallium/winsys/g3dvl \ $(DRIVER_INCLUDES) DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES) LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXv -lX11-xcb -lxcb-dri2 -lm diff --git a/src/gallium/targets/va-r300/Makefile b/src/gallium/targets/va-r300/Makefile index a270dfa7c99..7c89c79b5cc 100644 --- a/src/gallium/targets/va-r300/Makefile +++ b/src/gallium/targets/va-r300/Makefile @@ -4,11 +4,10 @@ include $(TOP)/configs/current LIBBASENAME = r300_drv_video DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r300/libr300.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ @@ -16,6 +15,7 @@ PIPE_DRIVERS = \ C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile index afead84391b..50e7fa5e560 100644 --- a/src/gallium/targets/va-r600/Makefile +++ b/src/gallium/targets/va-r600/Makefile @@ -4,18 +4,18 @@ include $(TOP)/configs/current LIBBASENAME = r600_drv_video DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ + $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/va-softpipe/Makefile b/src/gallium/targets/va-softpipe/Makefile index a58df36a966..536cb7b2903 100644 --- a/src/gallium/targets/va-softpipe/Makefile +++ b/src/gallium/targets/va-softpipe/Makefile @@ -12,7 +12,7 @@ PIPE_DRIVERS = \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ - $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c DRIVER_LIBS = diff --git a/src/gallium/targets/vdpau-nouveau/Makefile b/src/gallium/targets/vdpau-nouveau/Makefile index 55f990749cf..d3f1c7df8db 100644 --- a/src/gallium/targets/vdpau-nouveau/Makefile +++ b/src/gallium/targets/vdpau-nouveau/Makefile @@ -3,8 +3,9 @@ include $(TOP)/configs/current LIBBASENAME = vdpau_nouveau +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) + PIPE_DRIVERS = \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \ $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \ $(TOP)/src/gallium/drivers/nv50/libnv50.a \ @@ -16,6 +17,7 @@ PIPE_DRIVERS = \ C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/vdpau-r300/Makefile b/src/gallium/targets/vdpau-r300/Makefile index 849f72e03e8..1ada550af15 100644 --- a/src/gallium/targets/vdpau-r300/Makefile +++ b/src/gallium/targets/vdpau-r300/Makefile @@ -3,10 +3,10 @@ include $(TOP)/configs/current LIBBASENAME = vdpau_r300 +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r300/libr300.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/rbug/librbug.a \ @@ -17,6 +17,7 @@ PIPE_DRIVERS = \ C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/vdpau-r600/Makefile b/src/gallium/targets/vdpau-r600/Makefile index ef27b6572c2..05e0b4f45f1 100644 --- a/src/gallium/targets/vdpau-r600/Makefile +++ b/src/gallium/targets/vdpau-r600/Makefile @@ -3,15 +3,17 @@ include $(TOP)/configs/current LIBBASENAME = vdpau_r600 +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) + PIPE_DRIVERS = \ - $(TOP)/src/gallium/drivers/r600/libr600.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ + $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ + $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/vdpau-softpipe/Makefile b/src/gallium/targets/vdpau-softpipe/Makefile index 139b01b982a..41cc514929c 100644 --- a/src/gallium/targets/vdpau-softpipe/Makefile +++ b/src/gallium/targets/vdpau-softpipe/Makefile @@ -12,7 +12,7 @@ PIPE_DRIVERS = \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ - $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c DRIVER_LIBS = diff --git a/src/gallium/targets/xvmc-nouveau/Makefile b/src/gallium/targets/xvmc-nouveau/Makefile index 67036ee5090..06727f1c9f8 100644 --- a/src/gallium/targets/xvmc-nouveau/Makefile +++ b/src/gallium/targets/xvmc-nouveau/Makefile @@ -4,7 +4,6 @@ include $(TOP)/configs/current LIBBASENAME = XvMCnouveau PIPE_DRIVERS = \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \ $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \ $(TOP)/src/gallium/drivers/nv50/libnv50.a \ @@ -16,6 +15,7 @@ PIPE_DRIVERS = \ C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/xvmc-r300/Makefile b/src/gallium/targets/xvmc-r300/Makefile index 221335aae72..800f8d5254c 100644 --- a/src/gallium/targets/xvmc-r300/Makefile +++ b/src/gallium/targets/xvmc-r300/Makefile @@ -3,15 +3,17 @@ include $(TOP)/configs/current LIBBASENAME = XvMCr300 +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) + PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r300/libr300.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile index 666712015d5..d9ce72f11df 100644 --- a/src/gallium/targets/xvmc-r600/Makefile +++ b/src/gallium/targets/xvmc-r600/Makefile @@ -3,15 +3,17 @@ include $(TOP)/configs/current LIBBASENAME = XvMCr600 +DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) + PIPE_DRIVERS = \ - $(TOP)/src/gallium/drivers/r600/libr600.a \ - $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ + $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ + $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ target.c \ + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ $(COMMON_GALLIUM_SOURCES) \ $(DRIVER_SOURCES) diff --git a/src/gallium/targets/xvmc-softpipe/Makefile b/src/gallium/targets/xvmc-softpipe/Makefile index 5b60bede589..35db16f08e4 100644 --- a/src/gallium/targets/xvmc-softpipe/Makefile +++ b/src/gallium/targets/xvmc-softpipe/Makefile @@ -12,7 +12,7 @@ PIPE_DRIVERS = \ $(TOP)/src/gallium/auxiliary/libgallium.a C_SOURCES = \ - $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c + $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c DRIVER_LIBS = diff --git a/src/gallium/winsys/g3dvl/Makefile b/src/gallium/winsys/g3dvl/Makefile deleted file mode 100644 index 6c793e0f15b..00000000000 --- a/src/gallium/winsys/g3dvl/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# src/gallium/winsys/Makefile -TOP = ../../../.. -include $(TOP)/configs/current - -SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS) $(GALLIUM_WINSYS_DIRS) - -default install clean: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) $@) || exit 1; \ - fi \ - done diff --git a/src/gallium/winsys/g3dvl/dri/Makefile b/src/gallium/winsys/g3dvl/dri/Makefile deleted file mode 100644 index 43abcd9fb4b..00000000000 --- a/src/gallium/winsys/g3dvl/dri/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = vldri - -LIBRARY_INCLUDES = -I$(TOP)/src/gallium/winsys/g3dvl \ - $(shell $(PKG_CONFIG) libdrm --cflags-only-I) - -C_SOURCES = \ - dri_winsys.c - -include ../../../Makefile.template |