summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2017-09-22 23:08:46 +1000
committerJames Ross-Gowan <rossy@jrg.systems>2017-09-22 23:08:46 +1000
commitfab0448c5ebb163daf5a116eef6eb4c8596071d7 (patch)
tree93b1ad043deeca7c56fb2988b941b56b0d65858f /video
parent1d5620a65875e92151b2f032670838cb1ce0fe58 (diff)
downloadmpv-fab0448c5ebb163daf5a116eef6eb4c8596071d7.tar.bz2
mpv-fab0448c5ebb163daf5a116eef6eb4c8596071d7.tar.xz
Revert "cocoa: re-enable double buffering"
Enabling double buffering fixed some graphical glitches when entering fullscreen, but it also caused a fullscreen performance regression. We decided that the glitches were preferable to the performance regression. This reverts commit cee764849e4fe22b00fb3f31838a63906e2e0d54.
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m2
-rw-r--r--video/out/opengl/context_cocoa.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 8f09c25b91..abead0fb53 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -811,8 +811,6 @@ void vo_cocoa_swap_buffers(struct vo *vo)
}
pthread_mutex_unlock(&s->sync_lock);
- 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 6d3d8282e1..2256d31b67 100644
--- a/video/out/opengl/context_cocoa.c
+++ b/video/out/opengl/context_cocoa.c
@@ -72,7 +72,6 @@ static CGLError test_gl_version(struct ra_ctx *ctx, CGLOpenGLProfile ver)
// rejected attribute to preserve the fallback code
kCGLPFAOpenGLProfile,
(CGLPixelFormatAttribute) ver,
- kCGLPFADoubleBuffer,
kCGLPFAAccelerated,
kCGLPFAAllowOfflineRenderers,
// keep this one last to apply the cocoa-force-dedicated-gpu option
@@ -156,7 +155,10 @@ static void cocoa_uninit(struct ra_ctx *ctx)
static void cocoa_swap_buffers(struct ra_ctx *ctx)
{
+ struct priv *p = ctx->priv;
+ GL *gl = &p->gl;
vo_cocoa_swap_buffers(ctx->vo);
+ gl->Flush();
}
static bool cocoa_init(struct ra_ctx *ctx)