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
}
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
*
**************************************************************************/
+/*
+ * 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
*
**************************************************************************/
+/* directly referenced from target Makefile, because of X dependencies */
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "util/u_inlines.h"
#include "vl/vl_compositor.h"
-#include "vl_winsys.h"
+#include "vl/vl_winsys.h"
struct vl_dri_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;
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);
*
**************************************************************************/
+/* directly referenced from target Makefile, because of X dependencies */
+
#include <sys/time.h>
#include "pipe/p_state.h"
#include "softpipe/sp_public.h"
#include "vl/vl_compositor.h"
-#include "vl_winsys.h"
+#include "vl/vl_winsys.h"
struct vl_xsp_screen
{
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 \
#include "util/u_debug.h"
#include "util/u_memory.h"
-
-#include "vl_winsys.h"
+#include "vl/vl_winsys.h"
#include "va_private.h"
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 \
#include "util/u_debug.h"
#include "util/u_sampler.h"
-#include "vl_winsys.h"
-
#include "vdpau_private.h"
/**
#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"
#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 */
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 \
#include "util/u_memory.h"
#include "vl/vl_csc.h"
-#include "vl_winsys.h"
+#include "vl/vl_winsys.h"
#include "xvmc_private.h"
#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"
#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"
-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
-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
-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
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 \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
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)
$(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 =
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 \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
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 \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
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)
$(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 =
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 \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
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)
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)
$(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 =
+++ /dev/null
-# 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
+++ /dev/null
-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