Mesa (master): radeonsi: initial VDPAU target

[Christian König]

Module: Mesa
Branch: master
Commit: 41625afa2f7f30e5076c695ab3a16eabb5fe69f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=41625afa2f7f30e5076c695ab3a16eabb5fe69f8

Author: Christian König <deathsimple at vodafone.de>
Date:   Fri Jul 13 11:23:10 2012 +0200

radeonsi: initial VDPAU target

Windowed speed is of course way to slow, but fullscreen
works like a charm now.

Signed-off-by: Christian König <deathsimple at vodafone.de>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 configure.ac                                |    2 +-
 src/gallium/targets/vdpau-radeonsi/Makefile |   30 +++++++++++++++++++++++++++
 src/gallium/targets/vdpau-radeonsi/target.c |   24 +++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index f7fbf99..b6481a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2009,7 +2009,7 @@ if test "x$with_gallium_drivers" != x; then
                 AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.])
             fi
 	    NEED_RADEON_GALLIUM=yes;
-            gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi"
+            gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" ""
             ;;
         xnouveau)
             PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
diff --git a/src/gallium/targets/vdpau-radeonsi/Makefile b/src/gallium/targets/vdpau-radeonsi/Makefile
new file mode 100644
index 0000000..6dd2be9
--- /dev/null
+++ b/src/gallium/targets/vdpau-radeonsi/Makefile
@@ -0,0 +1,30 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = vdpau_radeonsi
+
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
+PIPE_DRIVERS = \
+	$(TOP)/src/gallium/drivers/radeonsi/libradeonsi.a \
+	$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
+	$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
+	$(TOP)/src/gallium/drivers/trace/libtrace.a \
+	$(TOP)/src/gallium/drivers/rbug/librbug.a \
+	$(TOP)/src/gallium/drivers/noop/libnoop.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_DEFINES = \
+	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
+
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+
+include ../Makefile.vdpau
+
+symlinks:
diff --git a/src/gallium/targets/vdpau-radeonsi/target.c b/src/gallium/targets/vdpau-radeonsi/target.c
new file mode 100644
index 0000000..ffb6662
--- /dev/null
+++ b/src/gallium/targets/vdpau-radeonsi/target.c
@@ -0,0 +1,24 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "radeon/drm/radeon_drm_public.h"
+#include "radeonsi/radeonsi_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 = radeonsi_screen_create(radeon);
+   if (!screen)
+      return NULL;
+
+   screen = debug_screen_wrap(screen);
+
+   return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("radeonsi", "radeon", create_screen, NULL)