summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-13 23:55:07 +0200
committerwm4 <wm4@nowhere>2015-05-14 00:05:43 +0200
commitdf97c30e0e324a7a51c3cb4a24eb27fcf30462b2 (patch)
tree4ac7c8ebec7cc932ef96c80f128c79a7ce8c3383 /video/out/vo_opengl.c
parent10de9b091a59e4831bb3fbfc46eb1d3c7558c9d8 (diff)
downloadmpv-df97c30e0e324a7a51c3cb4a24eb27fcf30462b2.tar.bz2
mpv-df97c30e0e324a7a51c3cb4a24eb27fcf30462b2.tar.xz
vo_opengl: create new API for OpenGL VO backends
An attempt to get rid of the weird mix of callbacks that take either struct vo or MPGLCopntext as parameter. This is not perfect, and the API will probably change a bit until all other code is ported to it. the main question is how to separate struct vo completely from the windowing code, which actually needs vo for very little. In the end, the legacy callbacks will be dropped.
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r--video/out/vo_opengl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 115c0fcebe..bc1abdb0f9 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -130,7 +130,7 @@ static void flip_page(struct vo *vo)
}
p->frame_started = false;
- p->glctx->swapGlBuffers(p->glctx);
+ mpgl_swap_buffers(p->glctx);
p->frames_rendered++;
if (p->frames_rendered > 5 && !p->use_gl_debug)
@@ -375,7 +375,7 @@ static int control(struct vo *vo, uint32_t request, void *data)
}
int events = 0;
- int r = p->glctx->vo_control(vo, &events, request, data);
+ int r = mpgl_control(p->glctx, &events, request, data);
if (events & VO_EVENT_ICC_PROFILE_CHANGED) {
get_and_update_icc_profile(p, &events);
vo->want_redraw = true;