diff options
| author | Maarten Lankhorst <[email protected]> | 2011-10-18 14:24:30 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2011-10-21 23:39:01 +0200 |
| commit | df8f864bf6fb8dfd256455a5310ef70f820a5350 (patch) | |
| tree | 4998b64d217f63afc3585a5feed64af87f96782e | |
| parent | 27b0c9d51300712f3b5d4af6cc20d53fcf9c8c46 (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 <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-nouveau/Makefile | 28 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-nouveau/target.c | 18 |
3 files changed, 47 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0864b55af0e..36961452866 100644 --- a/configure.ac +++ b/configure.ac @@ -1858,7 +1858,7 @@ if test "x$with_gallium_drivers" != x; then xnouveau) PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0" - gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau" + gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau" "vdpau-nouveau" ;; xswrast) GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" 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) |