RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wscript: remove dxva2-dxinterop configure test 

Wasn't really necessary as it was equivalent to gl-dxinterop.
This commit is contained in:
Kevin Mitchell 2016-02-17 10:17:52 -08:00
parent 2d1f42089c
commit 0d40140668
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
video/out/opengl/hwdec.c
View File

@ -44,10 +44,10 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = {
#if HAVE_VIDEOTOOLBOX_GL
&gl_hwdec_videotoolbox,
#endif
#if HAVE_DXVA2_DXINTEROP
#if HAVE_DXVA2_HWACCEL
#if HAVE_GL_DXINTEROP
&gl_hwdec_dxva2gldx,
#endif
#if HAVE_DXVA2_HWACCEL
&gl_hwdec_dxva2,
#endif
NULL

5
wscript
View File

@ -680,11 +680,6 @@ video_output_features = [
'func': check_statement(['EGL/egl.h'],
'eglCreateWindowSurface(0, 0, 0, 0)',
lib='EGL')
} , {
'name': '--dxva2-dxinterop',
'desc': 'DXVA2/OpenGL/DirectX Interop',
'deps': [ 'gl-dxinterop' ],
'func': check_true,
} , {
'name': '--vdpau',
'desc': 'VDPAU acceleration',

2
wscript_build.py
View File

@ -337,7 +337,7 @@ def build(ctx):
( "video/out/opengl/egl_helpers.c", "egl-helpers" ),
( "video/out/opengl/hwdec.c", "gl" ),
( "video/out/opengl/hwdec_dxva2.c", "gl-win32" ),
( "video/out/opengl/hwdec_dxva2gldx.c", "dxva2-dxinterop" ),
( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop" ),
( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ),
( "video/out/opengl/hwdec_vaglx.c", "vaapi-glx" ),
( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ),