summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2016-02-17 10:17:52 -0800
committerKevin Mitchell <kevmitch@gmail.com>2016-02-17 10:17:52 -0800
commit0d40140668a9f72162a234b874c0f0a89fd2fbc5 (patch)
tree006d1788fd7f6e140e47d1c009de50603ef42088
parent2d1f42089c31cd3238129303b13e1aa5ddfcfce2 (diff)
downloadmpv-0d40140668a9f72162a234b874c0f0a89fd2fbc5.tar.bz2
mpv-0d40140668a9f72162a234b874c0f0a89fd2fbc5.tar.xz
wscript: remove dxva2-dxinterop configure test
Wasn't really necessary as it was equivalent to gl-dxinterop.
-rw-r--r--video/out/opengl/hwdec.c4
-rw-r--r--wscript5
-rw-r--r--wscript_build.py2
3 files changed, 3 insertions, 8 deletions
diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c
index 3349c06f15..300197ac00 100644
--- a/video/out/opengl/hwdec.c
+++ b/video/out/opengl/hwdec.c
@@ -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
diff --git a/wscript b/wscript
index 1be10f2e9c..bf4da47a1f 100644
--- a/wscript
+++ b/wscript
@@ -681,11 +681,6 @@ video_output_features = [
'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',
'deps': [ 'x11' ],
diff --git a/wscript_build.py b/wscript_build.py
index 8bcf054db6..f0771a448a 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -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" ),