diff options
author | wm4 <wm4@nowhere> | 2015-05-01 18:44:45 +0200 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-05-07 10:42:10 +0900 |
commit | 8c3a92d6cb5293c0d058450cac0d1a1720411f47 (patch) | |
tree | bc933086133c552ad9f4edbe62902eab71041e15 /video/out/gl_video.h | |
parent | 488b5e3ac3986d20cd6184668252cce70bb23760 (diff) | |
download | mpv-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/gl_video.h')
-rw-r--r-- | video/out/gl_video.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/gl_video.h b/video/out/gl_video.h index 30647153b5..77608760a3 100644 --- a/video/out/gl_video.h +++ b/video/out/gl_video.h @@ -83,8 +83,7 @@ bool gl_video_check_format(struct gl_video *p, int mp_format); void gl_video_config(struct gl_video *p, struct mp_image_params *params); void gl_video_set_output_depth(struct gl_video *p, int r, int g, int b); void gl_video_set_lut3d(struct gl_video *p, struct lut3d *lut3d); -void gl_video_skip_image(struct gl_video *p, struct mp_image *mpi); -void gl_video_upload_image(struct gl_video *p, struct mp_image *img); +void gl_video_set_image(struct gl_video *p, struct mp_image *img); void gl_video_render_frame(struct gl_video *p, int fbo, struct frame_timing *t); void gl_video_resize(struct gl_video *p, int vp_w, int vp_h, struct mp_rect *src, struct mp_rect *dst, |