diff options
author | wm4 <wm4@nowhere> | 2015-07-16 22:43:40 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-07-16 22:43:40 +0200 |
commit | 968bd3df3b57685400c5d000c799d1ec9f7da59a (patch) | |
tree | b5a2c5e94c69c4eb30f1831c701fac69553fbbff /video/out/vo_opengl.c | |
parent | bb9717a630cd3d1cc0d8aecc03e18c86e49d4d9c (diff) | |
download | mpv-968bd3df3b57685400c5d000c799d1ec9f7da59a.tar.bz2 mpv-968bd3df3b57685400c5d000c799d1ec9f7da59a.tar.xz |
vo_opengl: refactor queue configuration
Just avoid some code duplication. Also, gl_video_set_options() having a
queue size output parameter is weird at best. While I don't appreciate
that this commit suddenly requires gl_video.c to deal with vo.c directly
in a special case, it's simply the best place to put this function.
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r-- | video/out/vo_opengl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index b25d162d7b..76276ccfe0 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -293,9 +293,8 @@ static bool reparse_cmdline(struct gl_priv *p, char *args) } if (r >= 0) { - int queue = 1; - gl_video_set_options(p->renderer, opts->renderer_opts, &queue); - vo_set_queue_params(p->vo, 0, opts->renderer_opts->interpolation, queue); + gl_video_set_options(p->renderer, opts->renderer_opts); + gl_video_configure_queue(p->renderer, p->vo); p->vo->want_redraw = true; } @@ -426,9 +425,8 @@ static int preinit(struct vo *vo) gl_video_set_osd_source(p->renderer, vo->osd); gl_video_set_output_depth(p->renderer, p->glctx->depth_r, p->glctx->depth_g, p->glctx->depth_b); - int queue = 0; - gl_video_set_options(p->renderer, p->renderer_opts, &queue); - vo_set_queue_params(p->vo, 0, p->renderer_opts->interpolation, queue); + gl_video_set_options(p->renderer, p->renderer_opts); + gl_video_configure_queue(p->renderer, vo); p->cms = gl_lcms_init(p, vo->log, vo->global); if (!p->cms) |