summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-17 22:39:04 +0100
committerwm4 <wm4@nowhere>2014-12-17 22:39:04 +0100
commit649e337f4d5efce70211de22b6573230f5b77f0a (patch)
tree2c538cf7cb2db7c971962a137ed4f26f47206580 /video/out
parent592aa9c70c1d7cbde1240b40ba6a285469d7d6b1 (diff)
downloadmpv-649e337f4d5efce70211de22b6573230f5b77f0a.tar.bz2
mpv-649e337f4d5efce70211de22b6573230f5b77f0a.tar.xz
vo_opengl: don't assume legacy OpenGL is available with GLES
OpenGL 3.0 has the weird situation that it's "hard" to detect whether legacy GL is really present. Since we pretend that we have OpenGL 3.0 if we use GLES, it was assuming legacy GL is available.
Diffstat (limited to 'video/out')
-rw-r--r--video/out/gl_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 2af96cab5a..a8f06f7b6b 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -541,7 +541,7 @@ void mpgl_load_functions2(GL *gl, void *(*get_fn)(void *ctx, const char *n),
// This version doesn't have GL_ARB_compatibility yet, and always
// includes legacy (except with CONTEXT_FORWARD_COMPATIBLE_BIT_ARB).
- if (gl->version == MPGL_VER(3, 0))
+ if (gl->version == MPGL_VER(3, 0) && !gl->es)
has_legacy = true;
} else {
const char *ext = (char*)gl->GetString(GL_EXTENSIONS);