diff options
| author |  myfreeer <myfreeer@users.noreply.github.com> | 2018-01-24 09:28:22 +0800 |
|---|---|---|
| committer |  Kevin Mitchell <kevmitch@gmail.com> | 2018-01-25 20:57:45 -0800 |
| commit | 573bfae7e46aea1ceb00400b5edbee762ed74254 (patch) | |
| tree | 333105fad00b1caa63c923b09d7734e00a67850e | |
| parent | e7febd6184e2fe0bb77968c90c3417e6188955e6 (diff) | |
hwdec: detach d3d and d3d9 hwaccel from angle
| -rw-r--r-- | video/out/gpu/hwdec.c | 4 | ||||
| -rw-r--r-- | wscript | 9 | ||||
| -rw-r--r-- | wscript_build.py | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c index 75d12b27f3..fc37074788 100644 --- a/video/out/gpu/hwdec.c +++ b/video/out/gpu/hwdec.c @@ -49,10 +49,12 @@ const struct ra_hwdec_driver *const ra_hwdec_drivers[] = { &ra_hwdec_videotoolbox, #endif #if HAVE_D3D_HWACCEL + #if HAVE_EGL_ANGLE &ra_hwdec_d3d11egl, &ra_hwdec_d3d11eglrgb, - #if HAVE_D3D9_HWACCEL + #if HAVE_D3D9_HWACCEL &ra_hwdec_dxva2egl, + #endif #endif #if HAVE_D3D11 &ra_hwdec_d3d11va, @@ -829,15 +829,14 @@ hwaccel_features = [ 'deps': 'gl-cocoa && videotoolbox-hwaccel', 'func': check_true }, { - # (conflated with ANGLE for easier deps) 'name': '--d3d-hwaccel', - 'desc': 'D3D11VA hwaccel (plus ANGLE)', - 'deps': 'os-win32 && egl-angle', + 'desc': 'D3D11VA hwaccel', + 'deps': 'os-win32', 'func': check_true, }, { 'name': '--d3d9-hwaccel', - 'desc': 'DXVA2 hwaccel (plus ANGLE)', - 'deps': 'd3d-hwaccel && egl-angle-win32', + 'desc': 'DXVA2 hwaccel', + 'deps': 'd3d-hwaccel', 'func': check_true, }, { 'name': '--gl-dxinterop-d3d9', diff --git a/wscript_build.py b/wscript_build.py index d8180f2cc8..ce51455c48 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -420,10 +420,10 @@ def build(ctx): ( "video/out/opengl/cuda_dynamic.c", "cuda-hwaccel" ), ( "video/out/opengl/egl_helpers.c", "egl-helpers" ), ( "video/out/opengl/hwdec_cuda.c", "cuda-hwaccel" ), - ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel" ), - ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel" ), + ( "video/out/opengl/hwdec_d3d11egl.c", "d3d-hwaccel && egl-angle" ), + ( "video/out/opengl/hwdec_d3d11eglrgb.c","d3d-hwaccel && egl-angle" ), ( "video/out/opengl/hwdec_dxva2gldx.c", "gl-dxinterop-d3d9" ), - ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel" ), + ( "video/out/opengl/hwdec_dxva2egl.c", "d3d9-hwaccel && egl-angle" ), ( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ), ( "video/out/opengl/hwdec_ios.m", "ios-gl" ), ( "video/out/opengl/hwdec_drmprime_drm.c","drmprime && drm" ), |