diff options
| author | Akemi <der.richter@gmx.de> | 2016-10-06 19:21:21 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-10-06 19:50:25 +0200 |
| commit | e543853a7ff0ab4dcd4ccaf06c448013fd41c03a (patch) | |
| tree | 52f3171752b9071c09b93099290c9e6f81a37642 | |
| parent | 9340f19ba24d72d14b860e59bcfc2a51cfeee1de (diff) | |
| download | mpv-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.
| -rw-r--r-- | DOCS/man/options.rst | 2 | ||||
| -rw-r--r-- | video/out/cocoa_common.m | 2 | ||||
| -rw-r--r-- | video/out/opengl/context_cocoa.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index a32cb98cca..d17aefe347 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4593,7 +4593,7 @@ The following video options are currently all specific to ``--vo=opengl`` and ``--opengl-early-flush=<yes|no>`` Call ``glFlush()`` after rendering a frame and before attempting to display - it (default: no). Can fix stuttering in some causes, in other cases probably + it (default: no). Can fix stuttering in some cases, in other cases probably causes it. For testing - could be removed any time. Miscellaneous 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 = { |