summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMaarten Lankhorst <m.b.lankhorst@gmail.com>2011-10-18 14:24:30 +0200
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>2011-10-21 23:39:01 +0200
commitdf8f864bf6fb8dfd256455a5310ef70f820a5350 (patch)
tree4998b64d217f63afc3585a5feed64af87f96782e /src/gallium
parent27b0c9d51300712f3b5d4af6cc20d53fcf9c8c46 (diff)
gallium/targets: Add vdpau target for nouveau
Should fall back to shader based decoding (g3dvl) for now. This is probably broken on systems that support xvmc, because nouveau_video_buffer_create has no way to know for what api the buffer is created, so I think this call might need a separate argument as workaround. Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/targets/vdpau-nouveau/Makefile28
-rw-r--r--src/gallium/targets/vdpau-nouveau/target.c18
2 files changed, 46 insertions, 0 deletions
diff --git a/src/gallium/targets/vdpau-nouveau/Makefile b/src/gallium/targets/vdpau-nouveau/Makefile
new file mode 100644
index 00000000000..55f990749cf
--- /dev/null
+++ b/src/gallium/targets/vdpau-nouveau/Makefile
@@ -0,0 +1,28 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = vdpau_nouveau
+
+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 \
+ $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \
+ $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
+ $(TOP)/src/gallium/drivers/trace/libtrace.a \
+ $(TOP)/src/gallium/auxiliary/libgallium.a
+
+
+C_SOURCES = \
+ target.c \
+ $(COMMON_GALLIUM_SOURCES) \
+ $(DRIVER_SOURCES)
+
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
+
+LINK_WITH_CXX=1
+
+include ../Makefile.vdpau
+
+symlinks:
diff --git a/src/gallium/targets/vdpau-nouveau/target.c b/src/gallium/targets/vdpau-nouveau/target.c
new file mode 100644
index 00000000000..d580b104421
--- /dev/null
+++ b/src/gallium/targets/vdpau-nouveau/target.c
@@ -0,0 +1,18 @@
+#include "state_tracker/drm_driver.h"
+#include "target-helpers/inline_debug_helper.h"
+#include "nouveau/drm/nouveau_drm_public.h"
+
+static struct pipe_screen *create_screen(int fd)
+{
+ struct pipe_screen *screen;
+
+ screen = nouveau_drm_screen_create(fd);
+ if (!screen)
+ return NULL;
+
+ screen = debug_screen_wrap(screen);
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen, NULL)