diff options
author | Matt Turner <[email protected]> | 2012-09-07 11:12:11 -0700 |
---|---|---|
committer | Matt Turner <[email protected]> | 2012-10-09 14:00:05 -0700 |
commit | 900cc7cf80d8ee0e454935904861cf0955c33072 (patch) | |
tree | d0fc63b184ff7df1976249598840535b0d693d8a /src/gallium/targets | |
parent | 63a15117a5eb495924bbcb70c067b6e11ab04476 (diff) |
Remove VAAPI support.
Not working and unmaintained.
Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/Makefile.va | 73 | ||||
-rw-r--r-- | src/gallium/targets/va-r300/Makefile | 26 | ||||
-rw-r--r-- | src/gallium/targets/va-r300/target.c | 24 | ||||
-rw-r--r-- | src/gallium/targets/va-r600/Makefile | 26 | ||||
-rw-r--r-- | src/gallium/targets/va-r600/target.c | 24 | ||||
-rw-r--r-- | src/gallium/targets/va-softpipe/Makefile | 21 |
6 files changed, 0 insertions, 194 deletions
diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va deleted file mode 100644 index 307fa63def6..00000000000 --- a/src/gallium/targets/Makefile.va +++ /dev/null @@ -1,73 +0,0 @@ -# This makefile template is used to build "driver"_drv_video.so - -LIBNAME = lib$(LIBBASENAME).so -VA_LIB_GLOB= lib$(LIBBASENAME).*so* -VA_MAJOR = 0 -VA_MINOR = 3 -INCLUDES = -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/winsys \ - $(DRIVER_INCLUDES) -DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(DRIVER_DEFINES) -LIBS = $(DRIVER_LIBS) -lva -lXext -lX11 -lm -STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/va/libvatracker.a - -ifeq ($(MESA_LLVM),1) -LDFLAGS += $(LLVM_LDFLAGS) -DRIVER_EXTRAS = $(LLVM_LIBS) -LD=$(CXX) -else - ifeq ($(LINK_WITH_CXX),1) - LD=$(CXX) - else - LD=$(CC) - endif -endif - -# XXX: Hack, VA public funcs aren't exported -OBJECTS = $(C_SOURCES:.c=.o) \ - $(ASM_SOURCES:.S=.o) \ - $(TOP)/src/gallium/state_trackers/va/*.o - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ - -##### TARGETS ##### - -default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) - -$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) Makefile - $(MKLIB) -o $(LIBBASENAME) -linker '$(LD)' -ldflags '$(LDFLAGS)' \ - -major $(VA_MAJOR) -minor $(VA_MINOR) $(MKLIB_OPTIONS) \ - -install $(TOP)/$(LIB_DIR)/gallium \ - $(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS) $(DRIVER_EXTRAS) - -$(TOP)/$(LIB_DIR)/gallium: - mkdir -p $@ - -depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) \ - $(ASM_SOURCES) 2> /dev/null - -# Emacs tags -tags: - etags `find . -name \*.[ch]` `find ../include` - -# Remove .o and backup files -clean: - -rm -f $(OBJECTS) *~ *.so $(SYMLINKS) - -rm -f depend depend.bak - -install: default - $(INSTALL) -d $(DESTDIR)$(VA_LIB_INSTALL_DIR) - $(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(VA_LIB_GLOB) $(DESTDIR)$(VA_LIB_INSTALL_DIR) - -include depend diff --git a/src/gallium/targets/va-r300/Makefile b/src/gallium/targets/va-r300/Makefile deleted file mode 100644 index 7c89c79b5cc..00000000000 --- a/src/gallium/targets/va-r300/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBBASENAME = r300_drv_video - -DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/drivers/r300/libr300.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/auxiliary/libgallium.a - -C_SOURCES = \ - target.c \ - $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon - -include ../Makefile.va - -symlinks: diff --git a/src/gallium/targets/va-r300/target.c b/src/gallium/targets/va-r300/target.c deleted file mode 100644 index 2fd7c2f6102..00000000000 --- a/src/gallium/targets/va-r300/target.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r300/r300_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct radeon_winsys *radeon; - struct pipe_screen *screen; - - radeon = radeon_drm_winsys_create(fd); - if (!radeon) - return NULL; - - screen = r300_screen_create(radeon); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("r300", "radeon", create_screen, NULL) diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile deleted file mode 100644 index 50e7fa5e560..00000000000 --- a/src/gallium/targets/va-r600/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBBASENAME = r600_drv_video - -DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I) - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/drivers/r600/libr600.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/auxiliary/libgallium.a - -C_SOURCES = \ - target.c \ - $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon - -include ../Makefile.va - -symlinks: diff --git a/src/gallium/targets/va-r600/target.c b/src/gallium/targets/va-r600/target.c deleted file mode 100644 index 3b7795b3507..00000000000 --- a/src/gallium/targets/va-r600/target.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "state_tracker/drm_driver.h" -#include "target-helpers/inline_debug_helper.h" -#include "radeon/drm/radeon_drm_public.h" -#include "r600/r600_public.h" - -static struct pipe_screen *create_screen(int fd) -{ - struct radeon_winsys *radeon; - struct pipe_screen *screen; - - radeon = radeon_drm_winsys_create(fd); - if (!radeon) - return NULL; - - screen = r600_screen_create(radeon); - if (!screen) - return NULL; - - screen = debug_screen_wrap(screen); - - return screen; -} - -DRM_DRIVER_DESCRIPTOR("r600", "radeon", create_screen, NULL) diff --git a/src/gallium/targets/va-softpipe/Makefile b/src/gallium/targets/va-softpipe/Makefile deleted file mode 100644 index 536cb7b2903..00000000000 --- a/src/gallium/targets/va-softpipe/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBBASENAME = softpipe_drv_video - -DRIVER_DEFINES = -DGALLIUM_SOFTPIPE -DRIVER_INCLUDES = - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/auxiliary/libgallium.a - -C_SOURCES = \ - $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c - -DRIVER_LIBS = - -include ../Makefile.va - -symlinks: |