summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-19 23:50:12 +0100
committerwm4 <wm4@nowhere>2014-12-19 23:50:12 +0100
commitfcd2ea760108ebc1c3eb59e443407e91b8a33e6b (patch)
tree8986956b18a405b8bc1bc0b3cd3fb96a1165d0a3 /video
parente749d26ac3347da2e319fc7f57e6ebb72becbd7b (diff)
downloadmpv-fcd2ea760108ebc1c3eb59e443407e91b8a33e6b.tar.bz2
mpv-fcd2ea760108ebc1c3eb59e443407e91b8a33e6b.tar.xz
vo_opengl: remove pointless glFinish calls
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_wayland.c2
-rw-r--r--video/out/gl_x11.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c
index 3e54f11962..a1c04b199d 100644
--- a/video/out/gl_wayland.c
+++ b/video/out/gl_wayland.c
@@ -180,11 +180,9 @@ static bool config_window_wayland(struct MPGLContext *ctx, int flags)
static void releaseGlContext_wayland(MPGLContext *ctx)
{
- GL *gl = ctx->gl;
struct vo_wayland_state *wl = ctx->vo->wayland;
if (wl->egl_context.egl.ctx) {
- gl->Finish();
eglReleaseThread();
wl_egl_window_destroy(wl->egl_context.egl_window);
eglDestroySurface(wl->egl_context.egl.dpy, wl->egl_context.egl_surface);
diff --git a/video/out/gl_x11.c b/video/out/gl_x11.c
index 083e5d263a..6f8e47b6f2 100644
--- a/video/out/gl_x11.c
+++ b/video/out/gl_x11.c
@@ -278,13 +278,10 @@ static void releaseGlContext_x11(MPGLContext *ctx)
XVisualInfo **vinfo = &glx_ctx->vinfo;
GLXContext *context = &glx_ctx->context;
Display *display = ctx->vo->x11->display;
- GL *gl = ctx->gl;
if (*vinfo)
XFree(*vinfo);
*vinfo = NULL;
if (*context) {
- if (gl->Finish)
- gl->Finish();
glXMakeCurrent(display, None, NULL);
glXDestroyContext(display, *context);
}