summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-10 14:36:23 +0100
committerwm4 <wm4@nowhere>2015-11-10 14:36:23 +0100
commit4682b0147e66f2e9b573510ae21f701a851d355a (patch)
treead0da501ce9b519a8bcb966928e5750f63a8af5a /video
parent479eb93d9eca84e696f08844ed92b369ab0e9c23 (diff)
downloadmpv-4682b0147e66f2e9b573510ae21f701a851d355a.tar.bz2
mpv-4682b0147e66f2e9b573510ae21f701a851d355a.tar.xz
vo_opengl: move the glFlush() call to the renderer
Diffstat (limited to 'video')
-rw-r--r--video/out/opengl/video.c5
-rw-r--r--video/out/vo_opengl.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c
index 5ed831bfe5..a89ee4e73a 100644
--- a/video/out/opengl/video.c
+++ b/video/out/opengl/video.c
@@ -2202,6 +2202,11 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo)
gl->UseProgram(0);
gl->BindFramebuffer(GL_FRAMEBUFFER, 0);
+ // The playloop calls this last before waiting some time until it decides
+ // to call flip_page(). Tell OpenGL to start execution of the GPU commands
+ // while we sleep (this happens asynchronously).
+ gl->Flush();
+
p->frames_rendered++;
}
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index ccd52cde69..23a22a3f7e 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -136,11 +136,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
gl_video_render_frame(p->renderer, frame, 0);
- // The playloop calls this last before waiting some time until it decides
- // to call flip_page(). Tell OpenGL to start execution of the GPU commands
- // while we sleep (this happens asynchronously).
- gl->Flush();
-
if (p->use_glFinish)
gl->Finish();
}