summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAman Gupta <aman@tmm1.net>2017-10-09 12:44:49 -0700
committerwm4 <wm4@nowhere>2017-10-09 21:49:01 +0200
commit502d074a317f912c17c5dd15889cdf91311a23c5 (patch)
tree513b25489319cb02623e65f7af7963831cb3cfde
parent05cb8d28afd8881667c3dea297b182a2ecdd91c8 (diff)
downloadmpv-502d074a317f912c17c5dd15889cdf91311a23c5.tar.bz2
mpv-502d074a317f912c17c5dd15889cdf91311a23c5.tar.xz
vo_gpu: android: fix gpu context
-rw-r--r--video/out/gpu/context.c4
-rw-r--r--wscript1
2 files changed, 5 insertions, 0 deletions
diff --git a/video/out/gpu/context.c b/video/out/gpu/context.c
index c8cbb1aa47..ff9cef226c 100644
--- a/video/out/gpu/context.c
+++ b/video/out/gpu/context.c
@@ -44,6 +44,7 @@ extern const struct ra_ctx_fns ra_ctx_wgl;
extern const struct ra_ctx_fns ra_ctx_angle;
extern const struct ra_ctx_fns ra_ctx_dxgl;
extern const struct ra_ctx_fns ra_ctx_rpi;
+extern const struct ra_ctx_fns ra_ctx_android;
extern const struct ra_ctx_fns ra_ctx_mali;
extern const struct ra_ctx_fns ra_ctx_vdpauglx;
@@ -54,6 +55,9 @@ extern const struct ra_ctx_fns ra_ctx_vulkan_xlib;
static const struct ra_ctx_fns *contexts[] = {
// OpenGL contexts:
+#if HAVE_ANDROID
+ &ra_ctx_android,
+#endif
#if HAVE_RPI
&ra_ctx_rpi,
#endif
diff --git a/wscript b/wscript
index 0a718c961a..8d99e82a62 100644
--- a/wscript
+++ b/wscript
@@ -156,6 +156,7 @@ main_dependencies = [
'func': compose_checks(
check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
check_cc(lib="android"),
+ check_cc(lib="EGL"),
)
}, {
'name': 'posix-or-mingw',