summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-19 23:50:12 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:13 +0900
commit21c4c50ac6f0e63bf793a99055533a063bbf4858 (patch)
tree2296364ba2139c0b6b7ef66d768aaaca2abc8ce0
parent86493730b269efa5391a65d8d52eb9a794e296e1 (diff)
downloadmpv-21c4c50ac6f0e63bf793a99055533a063bbf4858.tar.bz2
mpv-21c4c50ac6f0e63bf793a99055533a063bbf4858.tar.xz
vo_opengl: remove pointless glFinish calls
-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 2bc567ccae..42227d495c 100644
--- a/video/out/gl_x11.c
+++ b/video/out/gl_x11.c
@@ -274,13 +274,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);
}