summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFloens <floens@gmail.com>2016-06-20 16:53:25 +0200
committerwm4 <wm4@nowhere>2016-06-20 19:24:42 +0200
commit30adf280fdb439f4350ec5ed33500d23635af881 (patch)
tree126f0c860b8808c8b4507ce96a49c5c9ca39a6a2
parent9bac0ea42149ddc26ecf08a32f66334bc99340b5 (diff)
downloadmpv-30adf280fdb439f4350ec5ed33500d23635af881.tar.bz2
mpv-30adf280fdb439f4350ec5ed33500d23635af881.tar.xz
vo_opengl: GL_ARB_timer_query compile fix for GLES
The GL_ARB_timer_query extension and thus the GL_TIME_ELAPSED constant don't exist for GLES. For ES the EXT_disjoint_timer_query is used so take the constant from that else provide the constant manually. See pr #3216 which introduced this error.
-rw-r--r--video/out/opengl/header_fixes.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/video/out/opengl/header_fixes.h b/video/out/opengl/header_fixes.h
index 964b33a3fa..048165f7fd 100644
--- a/video/out/opengl/header_fixes.h
+++ b/video/out/opengl/header_fixes.h
@@ -88,6 +88,12 @@
#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB
#endif
+// GL_ARB_timer_query and EXT_disjoint_timer_query
+#ifndef GL_TIME_ELAPSED
+// Same as GL_TIME_ELAPSED_EXT
+#define GL_TIME_ELAPSED 0x88BF
+#endif
+
// GL_OES_EGL_image_external, GL_NV_EGL_stream_consumer_external
#ifndef GL_TEXTURE_EXTERNAL_OES
#define GL_TEXTURE_EXTERNAL_OES 0x8D65