From 80964226e9b8a05c39157f9305c06c0b2861e080 Mon Sep 17 00:00:00 2001 From: Christian König Date: Wed, 15 May 2013 15:10:11 +0200 Subject: implement NV_vdpau_interop v7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2: Actually implement interop between the gallium state tracker and the VDPAU backend. v3: Make it also available in non legacy contexts, fix video buffer sharing. v4: deny interop if we don't have the same screen object v5: rebased on upstream changes v6: implemented VDPAUGetSurfaceivNV, improved error handling, unregister all surfaces in VDPAUFiniNV v7: squash merge with Mareks changes Signed-off-by: Christian König --- src/gallium/state_trackers/vdpau/vdpau_private.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gallium/state_trackers/vdpau/vdpau_private.h') diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index bb91de13103..60196acee6d 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -36,6 +36,8 @@ #include "pipe/p_compiler.h" #include "pipe/p_video_codec.h" +#include "state_tracker/vdpau_interop.h" + #include "util/u_debug.h" #include "util/u_rect.h" #include "os/os_thread.h" @@ -498,6 +500,10 @@ VdpVideoMixerGetAttributeValues vlVdpVideoMixerGetAttributeValues; VdpVideoMixerDestroy vlVdpVideoMixerDestroy; VdpGenerateCSCMatrix vlVdpGenerateCSCMatrix; +/* interop to mesa state tracker */ +VdpVideoSurfaceGallium vlVdpVideoSurfaceGallium; +VdpOutputSurfaceGallium vlVdpOutputSurfaceGallium; + #define VDPAU_OUT 0 #define VDPAU_ERR 1 #define VDPAU_WARN 2 -- cgit v1.2.3