diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-22 23:26:43 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-23 04:09:16 +0100 |
| commit | f9668f55968f925d21fd98ff11842ea61e9890c4 (patch) | |
| tree | 12169f15dc8634fa3cf5b2c4f55abc67d81b7493 | |
| parent | 535e180b9ec4ac26a91b384f793b1411440214a1 (diff) | |
| download | mpv-f9668f55968f925d21fd98ff11842ea61e9890c4.tar.bz2 mpv-f9668f55968f925d21fd98ff11842ea61e9890c4.tar.xz | |
Support linking ANGLE
| -rw-r--r-- | video/out/opengl/angle_dynamic.c | 5 | ||||
| -rw-r--r-- | wscript | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/video/out/opengl/angle_dynamic.c b/video/out/opengl/angle_dynamic.c index f4540c473a..3c5a9ba036 100644 --- a/video/out/opengl/angle_dynamic.c +++ b/video/out/opengl/angle_dynamic.c @@ -4,6 +4,7 @@ #define ANGLE_NO_ALIASES #include "angle_dynamic.h" +#include "config.h" #include "common/common.h" #define ANGLE_DECL(NAME, VAR) \ @@ -28,6 +29,10 @@ static void angle_do_load(void) bool angle_load(void) { +#if !HAVE_EGL_ANGLE_LIB pthread_once(&angle_load_once, angle_do_load); return angle_loaded; +#else + return true; +#endif } @@ -736,6 +736,15 @@ video_output_features = [ 'func': check_statement(['EGL/egl.h', 'EGL/eglext.h'], 'int x = EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE') } , { + 'name': '--egl-angle-lib', + 'desc': 'OpenGL Win32 ANGLE Library', + 'deps': [ 'egl-angle' ], + 'groups': [ 'gl' ], + 'func': check_statement(['EGL/egl.h'], + 'eglCreateWindowSurface(0, 0, 0, 0)', + cflags="-DGL_APICALL= -DEGLAPI= -DANGLE_NO_ALIASES", + lib=['EGL', 'GLESv2', 'dxguid', 'd3d9', 'gdi32', 'stdc++']) + } , { 'name': '--vdpau', 'desc': 'VDPAU acceleration', 'deps': [ 'x11' ], |