diff options
| author | wm4 <wm4@nowhere> | 2014-06-15 23:58:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-16 01:00:59 +0200 |
| commit | eca0fcb77a95793b31b6447e0c91bf4d4045efeb (patch) | |
| tree | 1f244579f55c72b403804ccb8c05d5a8081126d3 /video/out/vo_opengl.c | |
| parent | c5e13cce52fbf4cd45ec0c6220fe2e5f056bb2cd (diff) | |
| download | mpv-eca0fcb77a95793b31b6447e0c91bf4d4045efeb.tar.bz2 mpv-eca0fcb77a95793b31b6447e0c91bf4d4045efeb.tar.xz | |
vo_opengl: simplify redraw callback OSD handling
OSD used to be not thread-safe at all, so a track was used to get it
redrawn. This mostly reverts commit 6a2a8880, because OSD not being
thread-safe was the non-trivial part of it.
Mostly untested, because this code path is used on OSX only, and I don't
have OSX.
Diffstat (limited to 'video/out/vo_opengl.c')
| -rw-r--r-- | video/out/vo_opengl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index cfbd0e590f..c6464f09e9 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -121,7 +121,6 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) mpgl_lock(p->glctx); gl_video_upload_image(p->renderer, mpi); gl_video_render_frame(p->renderer); - gl_video_draw_osd(p->renderer); mpgl_unlock(p->glctx); } @@ -370,7 +369,6 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_REDRAW_FRAME: mpgl_lock(p->glctx); gl_video_render_frame(p->renderer); - gl_video_draw_osd(p->renderer); mpgl_unlock(p->glctx); return true; case VOCTRL_SET_COMMAND_LINE: { |