summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'libvo/gl_common.c')
-rw-r--r--libvo/gl_common.c31
1 files changed, 9 insertions, 22 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 055b386639..90d6ffaa40 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1996,9 +1996,9 @@ static bool create_window_cocoa(struct MPGLContext *ctx, uint32_t d_width,
getFunctions(ctx->gl, (void *)vo_cocoa_glgetaddr, NULL, gl3);
if (gl3) {
- ctx->depth_r = vo_cocoa_cgl_color_size();
- ctx->depth_g = vo_cocoa_cgl_color_size();
- ctx->depth_b = vo_cocoa_cgl_color_size();
+ ctx->depth_r = vo_cocoa_cgl_color_size(ctx->vo);
+ ctx->depth_g = vo_cocoa_cgl_color_size(ctx->vo);
+ ctx->depth_b = vo_cocoa_cgl_color_size(ctx->vo);
}
if (!ctx->gl->SwapInterval)
@@ -2025,22 +2025,7 @@ static void releaseGlContext_cocoa(MPGLContext *ctx)
static void swapGlBuffers_cocoa(MPGLContext *ctx)
{
- vo_cocoa_swap_buffers();
-}
-
-static int cocoa_check_events(struct vo *vo)
-{
- return vo_cocoa_check_events(vo);
-}
-
-static void cocoa_update_xinerama_info(struct vo *vo)
-{
- vo_cocoa_update_xinerama_info(vo);
-}
-
-static void cocoa_fullscreen(struct vo *vo)
-{
- vo_cocoa_fullscreen(vo);
+ vo_cocoa_swap_buffers(ctx->vo);
}
#endif
@@ -2532,11 +2517,13 @@ MPGLContext *mpgl_init(enum MPGLType type, struct vo *vo)
ctx->create_window_gl3 = create_window_cocoa_gl3;
ctx->releaseGlContext = releaseGlContext_cocoa;
ctx->swapGlBuffers = swapGlBuffers_cocoa;
- ctx->check_events = cocoa_check_events;
- ctx->update_xinerama_info = cocoa_update_xinerama_info;
- ctx->fullscreen = cocoa_fullscreen;
+ ctx->check_events = vo_cocoa_check_events;
+ ctx->update_xinerama_info = vo_cocoa_update_xinerama_info;
+ ctx->fullscreen = vo_cocoa_fullscreen;
ctx->ontop = vo_cocoa_ontop;
ctx->vo_init = vo_cocoa_init;
+ ctx->pause = vo_cocoa_pause;
+ ctx->resume = vo_cocoa_resume;
ctx->vo_uninit = vo_cocoa_uninit;
break;
#endif