diff options
author | Christian König <deathsimple@vodafone.de> | 2012-03-26 19:40:42 +0200 |
---|---|---|
committer | Christian König <deathsimple@vodafone.de> | 2012-03-28 15:47:41 +0200 |
commit | fc0a5e21d77ae2f082fd19dd2295e84f6fb7bd3b (patch) | |
tree | daf5abda1a00d12583855b1652ca2c65d75d5c1a /src/gallium/targets | |
parent | ba83b8b4ae8adfc7520baf119f8c56bdcbf6547f (diff) | |
download | external_mesa3d-fc0a5e21d77ae2f082fd19dd2295e84f6fb7bd3b.zip external_mesa3d-fc0a5e21d77ae2f082fd19dd2295e84f6fb7bd3b.tar.gz external_mesa3d-fc0a5e21d77ae2f082fd19dd2295e84f6fb7bd3b.tar.bz2 |
vl: move winsys helper out of winsys directory
They aren't winsys of their own,
just help dealing with them.
v2: add some more comments in vl_winsys.h
Signed-off-by: Christian König <deathsimple@vodafone.de>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/Makefile.va | 1 | ||||
-rw-r--r-- | src/gallium/targets/Makefile.vdpau | 1 | ||||
-rw-r--r-- | src/gallium/targets/Makefile.xvmc | 1 | ||||
-rw-r--r-- | src/gallium/targets/va-r300/Makefile | 4 | ||||
-rw-r--r-- | src/gallium/targets/va-r600/Makefile | 6 | ||||
-rw-r--r-- | src/gallium/targets/va-softpipe/Makefile | 2 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-nouveau/Makefile | 4 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-r300/Makefile | 3 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-r600/Makefile | 8 | ||||
-rw-r--r-- | src/gallium/targets/vdpau-softpipe/Makefile | 2 | ||||
-rw-r--r-- | src/gallium/targets/xvmc-nouveau/Makefile | 2 | ||||
-rw-r--r-- | src/gallium/targets/xvmc-r300/Makefile | 4 | ||||
-rw-r--r-- | src/gallium/targets/xvmc-r600/Makefile | 8 | ||||
-rw-r--r-- | src/gallium/targets/xvmc-softpipe/Makefile | 2 |
14 files changed, 27 insertions, 21 deletions
diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va index 7215fc3..884b59d 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 2c2385c..a9e7a9c 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 5eafe98..217481e 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 a270dfa..7c89c79 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 afead84..50e7fa5 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 a58df36..536cb7b 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 55f9907..d3f1c7d 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 849f72e..1ada550 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 ef27b65..05e0b4f 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 139b01b..41cc514 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 67036ee..06727f1 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 221335a..800f8d5 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 6667120..d9ce72f 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 5b60bed..35db16f 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 = |