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

hwdec: detach d3d and d3d9 hwaccel from angle 

Fix https://github.com/mpv-player/mpv/issues/5420
This commit is contained in:
myfreeer 2018-01-24 09:28:22 +08:00 committed by Kevin Mitchell
parent e7febd6184
commit 573bfae7e4
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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,

9
wscript
View File

@ -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',

6
wscript_build.py
View File

@ -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" ),