summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl_cb.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-01 18:44:45 +0200
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-05-07 10:42:10 +0900
commit8c3a92d6cb5293c0d058450cac0d1a1720411f47 (patch)
treebc933086133c552ad9f4edbe62902eab71041e15 /video/out/vo_opengl_cb.c
parent488b5e3ac3986d20cd6184668252cce70bb23760 (diff)
downloadmpv-8c3a92d6cb5293c0d058450cac0d1a1720411f47.tar.bz2
mpv-8c3a92d6cb5293c0d058450cac0d1a1720411f47.tar.xz
vo_opengl: refactor wayland frame skipping
Currently, the wayland backend needs extra work to avoid drawing more often than the wayland frame callback allows. (This is not ideal, but will be fixed at a later time.) Unify this with the start_frame callback added for cocoa. Some details change for the better. For example, if a frame is dropped, and a redraw is done afterwards, the actually correct frame is redrawn, instead whatever was in the textures from before the dropped frame. (cherry picked from commit 0a7abbda6b555fb7746f737b52d0f00fb3e614db)
Diffstat (limited to 'video/out/vo_opengl_cb.c')
-rw-r--r--video/out/vo_opengl_cb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index 2f2ac63f21..1a2e1bf9a8 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -328,7 +328,7 @@ int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int vp_w, int vp_h)
pthread_mutex_unlock(&ctx->lock);
if (mpi)
- gl_video_upload_image(ctx->renderer, mpi);
+ gl_video_set_image(ctx->renderer, mpi);
gl_video_render_frame(ctx->renderer, fbo, NULL);