github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00
Code Releases Activity

vo_gpu: remove weird p->vo indirection

Browse Source 
That's just unnecessary.
This commit is contained in:
wm4 2017-10-17 09:09:00 +02:00
parent c90f76d322
commit 77945b2c16
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
video/out/vo_gpu.c
View File

@ -43,7 +43,6 @@
#include "gpu/video.h" #include "gpu/video.h"
struct gpu_priv { struct gpu_priv {
struct vo *vo;
struct mp_log *log; struct mp_log *log;
struct ra_ctx *ctx; struct ra_ctx *ctx;
@ -56,9 +55,9 @@ struct gpu_priv {
int events; int events;
}; };
static void resize(struct gpu_priv *p) static void resize(struct vo *vo)
{ {
struct vo *vo = p->vo; struct gpu_priv *p = vo->priv;
struct ra_swapchain *sw = p->ctx->swapchain; struct ra_swapchain *sw = p->ctx->swapchain;
MP_VERBOSE(vo, "Resize: %dx%d\n", vo->dwidth, vo->dheight); MP_VERBOSE(vo, "Resize: %dx%d\n", vo->dwidth, vo->dheight);
@ -115,7 +114,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params)
if (!p->ctx->fns->reconfig(p->ctx)) if (!p->ctx->fns->reconfig(p->ctx))
return -1; return -1;
resize(p); resize(vo);
gl_video_config(p->renderer, params); gl_video_config(p->renderer, params);
return 0; return 0;
@ -128,7 +127,7 @@ static void request_hwdec_api(struct vo *vo, void *api)
if (p->hwdec) if (p->hwdec)
return; return;
p->hwdec = ra_hwdec_load_api(p->vo->log, p->ctx->ra, p->vo->global, p->hwdec = ra_hwdec_load_api(vo->log, p->ctx->ra, vo->global,
vo->hwdec_devs, (intptr_t)api); vo->hwdec_devs, (intptr_t)api);
gl_video_set_hwdec(p->renderer, p->hwdec); gl_video_set_hwdec(p->renderer, p->hwdec);
} }
@ -179,7 +178,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
switch (request) { switch (request) {
case VOCTRL_SET_PANSCAN: case VOCTRL_SET_PANSCAN:
resize(p); resize(vo);
return VO_TRUE; return VO_TRUE;
case VOCTRL_SET_EQUALIZER: case VOCTRL_SET_EQUALIZER:
vo->want_redraw = true; vo->want_redraw = true;
@ -200,8 +199,8 @@ static int control(struct vo *vo, uint32_t request, void *data)
return true; return true;
case VOCTRL_UPDATE_RENDER_OPTS: { case VOCTRL_UPDATE_RENDER_OPTS: {
get_and_update_icc_profile(p); get_and_update_icc_profile(p);
gl_video_configure_queue(p->renderer, p->vo); gl_video_configure_queue(p->renderer, vo);
p->vo->want_redraw = true; vo->want_redraw = true;
return true; return true;
} }
case VOCTRL_RESET: case VOCTRL_RESET:
@ -229,7 +228,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
events |= p->events; events |= p->events;
p->events = 0; p->events = 0;
if (events & VO_EVENT_RESIZE) if (events & VO_EVENT_RESIZE)
resize(p); resize(vo);
if (events & VO_EVENT_EXPOSE) if (events & VO_EVENT_EXPOSE)
vo->want_redraw = true; vo->want_redraw = true;
vo_event(vo, events); vo_event(vo, events);
@ -278,7 +277,6 @@ static void uninit(struct vo *vo)
static int preinit(struct vo *vo) static int preinit(struct vo *vo)
{ {
struct gpu_priv *p = vo->priv; struct gpu_priv *p = vo->priv;
p->vo = vo;
p->log = vo->log; p->log = vo->log;
int alpha_mode; int alpha_mode;
@ -303,7 +301,7 @@ static int preinit(struct vo *vo)
hwdec_devices_set_loader(vo->hwdec_devs, call_request_hwdec_api, vo); hwdec_devices_set_loader(vo->hwdec_devs, call_request_hwdec_api, vo);
p->hwdec = ra_hwdec_load(p->vo->log, p->ctx->ra, vo->global, p->hwdec = ra_hwdec_load(vo->log, p->ctx->ra, vo->global,
vo->hwdec_devs, vo->opts->gl_hwdec_interop); vo->hwdec_devs, vo->opts->gl_hwdec_interop);
gl_video_set_hwdec(p->renderer, p->hwdec); gl_video_set_hwdec(p->renderer, p->hwdec);