Support linking ANGLE

mpv-player · Nov 23, 2016 · f9668f5 · f9668f5
1 parent 535e180
commit f9668f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git 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
 }
diff --git a/wscript b/wscript
@@ -735,6 +735,15 @@ video_output_features = [
         'groups': [ 'gl' ],
         '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',