diff options
author | wm4 <wm4@nowhere> | 2015-05-13 23:40:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-05-14 00:05:39 +0200 |
commit | 10de9b091a59e4831bb3fbfc46eb1d3c7558c9d8 (patch) | |
tree | dbb20ff7a385a8992f11cc036658a9f3dbf4b2c9 /video/out/gl_x11.c | |
parent | 27da344e6f88166a236da0e3c2163c05125e4cb3 (diff) | |
download | mpv-10de9b091a59e4831bb3fbfc46eb1d3c7558c9d8.tar.bz2 mpv-10de9b091a59e4831bb3fbfc46eb1d3c7558c9d8.tar.xz |
vo_opengl: change user options for requesting GLES
Instead of having separate backends, make use of GLES a flag. This
reduces the number of backends and the resulting annoyances.
Also, nobody cares about using GLES, so there's no backward
compatibility either.
Diffstat (limited to 'video/out/gl_x11.c')
-rw-r--r-- | video/out/gl_x11.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/video/out/gl_x11.c b/video/out/gl_x11.c index 8fb4e59ac8..8310cfe7de 100644 --- a/video/out/gl_x11.c +++ b/video/out/gl_x11.c @@ -33,7 +33,6 @@ struct glx_context { XVisualInfo *vinfo; GLXContext context; GLXFBConfig fbc; - bool force_es; }; static bool create_context_x11_old(struct MPGLContext *ctx) @@ -252,7 +251,7 @@ static bool config_window_x11(struct MPGLContext *ctx, int flags) int gl_version = ctx->requested_gl_version; bool success = false; - if (!glx_ctx->force_es) { + if (!(flags & VOFLAG_GLES)) { success = create_context_x11_gl3(ctx, flags, gl_version, false); if (!success) success = create_context_x11_old(ctx); @@ -295,10 +294,3 @@ void mpgl_set_backend_x11(MPGLContext *ctx) ctx->vo_uninit = vo_x11_uninit; ctx->vo_control = vo_x11_control; } - -void mpgl_set_backend_x11es(MPGLContext *ctx) -{ - mpgl_set_backend_x11(ctx); - struct glx_context *glx_ctx = ctx->priv; - glx_ctx->force_es = true; -} |