summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl_cb.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-16 22:43:40 +0200
committerwm4 <wm4@nowhere>2015-07-16 22:43:40 +0200
commit968bd3df3b57685400c5d000c799d1ec9f7da59a (patch)
treeb5a2c5e94c69c4eb30f1831c701fac69553fbbff /video/out/vo_opengl_cb.c
parentbb9717a630cd3d1cc0d8aecc03e18c86e49d4d9c (diff)
downloadmpv-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_cb.c')
-rw-r--r--video/out/vo_opengl_cb.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index 35241de207..fe7ed86d75 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -329,9 +329,8 @@ int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int vp_w, int vp_h)
struct vo_priv *p = vo ? vo->priv : NULL;
struct vo_priv *opts = ctx->new_opts ? ctx->new_opts : p;
if (opts) {
- int queue = 0;
- gl_video_set_options(ctx->renderer, opts->renderer_opts, &queue);
- vo_set_queue_params(vo, 0, opts->renderer_opts->interpolation, queue);
+ gl_video_set_options(ctx->renderer, opts->renderer_opts);
+ gl_video_configure_queue(ctx->renderer, vo);
ctx->gl->debug_context = opts->use_gl_debug;
gl_video_set_debug(ctx->renderer, opts->use_gl_debug);
frame_queue_shrink(ctx, opts->frame_queue_size);