From 63377744f3dfff04fe02c832b24f8537b78ee8d3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 3 Dec 2014 21:13:59 +0100 Subject: vdpau/GLX: don't access VO backend Same as with the previous commits. In theory, vdpau/x11 GL interop doesn't assume GLX. It could use EGL as well. But since it's always GLX in practice, so we're fine with this. Remove the gl_hwdec.mpgl field - it's unused now. --- video/vdpau.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'video/vdpau.h') diff --git a/video/vdpau.h b/video/vdpau.h index 6f60165ed1..f1c29fd50d 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -38,7 +38,7 @@ struct vdp_functions { // incompatible to each other, so all code must use a shared VdpDevice. struct mp_vdpau_ctx { struct mp_log *log; - struct vo_x11_state *x11; + Display *x11; // These are mostly immutable, except on preemption. We don't really care // to synchronize the preemption case fully correctly, because it's an @@ -70,8 +70,7 @@ struct mp_vdpau_ctx { } video_surfaces[MAX_VIDEO_SURFACES]; }; -struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, - struct vo_x11_state *x11); +struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log, Display *x11); void mp_vdpau_destroy(struct mp_vdpau_ctx *ctx); int mp_vdpau_handle_preemption(struct mp_vdpau_ctx *ctx, uint64_t *counter); -- cgit v1.2.3