diff options
| author | wm4 <wm4@nowhere> | 2014-12-03 21:13:59 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-03 21:13:59 +0100 |
| commit | 63377744f3dfff04fe02c832b24f8537b78ee8d3 (patch) | |
| tree | 7f3f3f0f46d4d814679975f6fe035dc3f412fa42 /video/vdpau.c | |
| parent | 031aef9be9052dce8ff7b7446b979b2e2d418b3d (diff) | |
| download | mpv-63377744f3dfff04fe02c832b24f8537b78ee8d3.tar.bz2 mpv-63377744f3dfff04fe02c832b24f8537b78ee8d3.tar.xz | |
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.
Diffstat (limited to 'video/vdpau.c')
| -rw-r--r-- | video/vdpau.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video/vdpau.c b/video/vdpau.c index 754b6d300c..650f181907 100644 --- a/video/vdpau.c +++ b/video/vdpau.c @@ -47,7 +47,7 @@ static void preemption_callback(VdpDevice device, void *context) static int win_x11_init_vdpau_procs(struct mp_vdpau_ctx *ctx) { - struct vo_x11_state *x11 = ctx->x11; + Display *x11 = ctx->x11; VdpStatus vdp_st; // Don't operate on ctx->vdp directly, so that even if init fails, ctx->vdp @@ -71,7 +71,7 @@ static int win_x11_init_vdpau_procs(struct mp_vdpau_ctx *ctx) }; VdpGetProcAddress *get_proc_address; - vdp_st = vdp_device_create_x11(x11->display, x11->screen, &ctx->vdp_device, + vdp_st = vdp_device_create_x11(x11, DefaultScreen(x11), &ctx->vdp_device, &get_proc_address); if (vdp_st != VDP_STATUS_OK) { if (ctx->is_preempted) @@ -295,8 +295,7 @@ struct mp_image *mp_vdpau_get_video_surface(struct mp_vdpau_ctx *ctx, return mp_vdpau_get_surface(ctx, chroma, 0, false, w, h); } -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) { struct mp_vdpau_ctx *ctx = talloc_ptrtype(NULL, ctx); *ctx = (struct mp_vdpau_ctx) { |