From dd408e68ed57fa5130bef976751e58a5d6e42f75 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 30 Jun 2017 12:27:15 +0200
Subject: d3d: make DXVA2 support optional

This partially reverts the change from a longer time ago to always build
DXVA2 and D3D11VA together.

To make it simpler, we change the following:
- building with ANGLE headers is now required to build D3D hwaccels
- if DXVA2 is enabled, D3D11VA is still forcibly built
- the CLI vo_opengl ANGLE backend is now under --egl-angle-win32

This is done to reduce the dependency mess slightly.
---
 video/out/opengl/context.c | 2 +-
 video/out/opengl/hwdec.c   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'video/out')

diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c
index 72311e11fa..a3b92ac8b4 100644
--- a/video/out/opengl/context.c
+++ b/video/out/opengl/context.c
@@ -56,7 +56,7 @@ static const struct mpgl_driver *const backends[] = {
 #if HAVE_GL_COCOA
     &mpgl_driver_cocoa,
 #endif
-#if HAVE_EGL_ANGLE
+#if HAVE_EGL_ANGLE_WIN32
     &mpgl_driver_angle,
 #endif
 #if HAVE_GL_WIN32
diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c
index 60a6ee82a9..346493671f 100644
--- a/video/out/opengl/hwdec.c
+++ b/video/out/opengl/hwdec.c
@@ -51,15 +51,15 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = {
     &gl_hwdec_videotoolbox,
 #endif
 #if HAVE_D3D_HWACCEL
-#if HAVE_EGL_ANGLE
     &gl_hwdec_d3d11egl,
     &gl_hwdec_d3d11eglrgb,
+ #if HAVE_D3D9_HWACCEL
     &gl_hwdec_dxva2egl,
+ #endif
 #endif
-#if HAVE_GL_DXINTEROP
+#if HAVE_GL_DXINTEROP_D3D9
     &gl_hwdec_dxva2gldx,
 #endif
-#endif
 #if HAVE_CUDA_HWACCEL
     &gl_hwdec_cuda,
 #endif
-- 
cgit v1.2.3