summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2016-10-06 19:21:21 +0200
committerwm4 <wm4@nowhere>2016-10-06 19:50:25 +0200
commite543853a7ff0ab4dcd4ccaf06c448013fd41c03a (patch)
tree52f3171752b9071c09b93099290c9e6f81a37642 /video
parent9340f19ba24d72d14b860e59bcfc2a51cfeee1de (diff)
downloadmpv-e543853a7ff0ab4dcd4ccaf06c448013fd41c03a.tar.bz2
mpv-e543853a7ff0ab4dcd4ccaf06c448013fd41c03a.tar.xz
cocoa: add glFlush() to cocoa backend
The glFlush() call was made optional recently since it's not needed in most cases. On OSX though this is needed since we removed kCGLPFADoubleBuffer from the context creation, so the glFlush() call was added to the cocoa backend only. The CGLFlushDrawable() call can be safely removed since it only does something when a double buffered context is used. Also fixes a small typo. Fixes #3627.
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m2
-rw-r--r--video/out/opengl/context_cocoa.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 9690ddb10f..ba241f42cc 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -718,8 +718,6 @@ void vo_cocoa_swap_buffers(struct vo *vo)
if (skip)
return;
- CGLFlushDrawable(s->cgl_ctx);
-
pthread_mutex_lock(&s->lock);
s->frame_w = vo->dwidth;
s->frame_h = vo->dheight;
diff --git a/video/out/opengl/context_cocoa.c b/video/out/opengl/context_cocoa.c
index 267c706d62..941274ce6c 100644
--- a/video/out/opengl/context_cocoa.c
+++ b/video/out/opengl/context_cocoa.c
@@ -153,6 +153,7 @@ static int cocoa_control(struct MPGLContext *ctx, int *events, int request,
static void cocoa_swap_buffers(struct MPGLContext *ctx)
{
vo_cocoa_swap_buffers(ctx->vo);
+ ctx->gl->Flush();
}
const struct mpgl_driver mpgl_driver_cocoa = {