summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2015-11-19 20:18:39 +1100
committerJames Ross-Gowan <rossymiles@gmail.com>2015-11-19 20:37:30 +1100
commit76e4374d0644edbde087896497aca4e1cf0906a0 (patch)
tree2a586a9d2298d4a4e834caa1f3dc1fb7de925ffc
parent7e285a6f718a84b06994a4c0196a7469058eb241 (diff)
downloadmpv-76e4374d0644edbde087896497aca4e1cf0906a0.tar.bz2
mpv-76e4374d0644edbde087896497aca4e1cf0906a0.tar.xz
vo_opengl: fix ANGLE GLES3 mode
Turns out glGetTexLevelParameter, which is missing in ANGLE, is a GLES3.1 function. Removing it from the list of core GLES3 functions makes ANGLE work in GLES3 mode.
-rw-r--r--video/out/opengl/angle.c2
-rw-r--r--video/out/opengl/common.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/video/out/opengl/angle.c b/video/out/opengl/angle.c
index 7aac2bd29d..a0d30e6df3 100644
--- a/video/out/opengl/angle.c
+++ b/video/out/opengl/angle.c
@@ -83,7 +83,7 @@ static bool create_context_egl(MPGLContext *ctx, EGLConfig config,
struct priv *p = ctx->priv;
EGLint context_attributes[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
+ EGL_CONTEXT_CLIENT_VERSION, 3,
EGL_NONE
};
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
index 660b4b2717..e3e2af6e8b 100644
--- a/video/out/opengl/common.c
+++ b/video/out/opengl/common.c
@@ -175,12 +175,19 @@ static const struct gl_functions gl_functions[] = {
DEF_FN(BlitFramebuffer),
DEF_FN(GetStringi),
// for ES 3.0
- DEF_FN(GetTexLevelParameteriv),
DEF_FN(ReadBuffer),
DEF_FN(UnmapBuffer),
{0}
},
},
+ // For ES 3.1 core
+ {
+ .ver_es_core = 310,
+ .functions = (const struct gl_function[]) {
+ DEF_FN(GetTexLevelParameteriv),
+ {0}
+ },
+ },
// Useful for ES 2.0
{
.ver_core = 110,