[vlc-commits] d3d11_fmt: don't use WARP devices at all

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Fri Oct 27 13:03:51 2017 +0200| [3e2f241acb7b33d2baad5e67bcd12e29b98a48ef] | committer: Jean-Baptiste Kempf

d3d11_fmt: don't use WARP devices at all

It just adds confusion between hardware decoders and the display and adds
nothing useful.

Fixes #18923

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e2f241acb7b33d2baad5e67bcd12e29b98a48ef
---

 modules/video_chroma/d3d11_fmt.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index f3782004a2..c8994535bf 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -186,7 +186,6 @@ static inline HRESULT D3D11_CreateDevice(vlc_object_t *obj, HINSTANCE hdecoder_d
 
     static const D3D_DRIVER_TYPE driverAttempts[] = {
         D3D_DRIVER_TYPE_HARDWARE,
-        D3D_DRIVER_TYPE_WARP,
 #if 0 /* ifndef NDEBUG */
         D3D_DRIVER_TYPE_REFERENCE,
 #endif
@@ -198,7 +197,7 @@ static inline HRESULT D3D11_CreateDevice(vlc_object_t *obj, HINSTANCE hdecoder_d
         D3D_FEATURE_LEVEL_9_3, D3D_FEATURE_LEVEL_9_2, D3D_FEATURE_LEVEL_9_1
     };
 
-    for (UINT driver = 0; driver < (hw_decoding?1:2); driver++) {
+    for (UINT driver = 0; driver < ARRAY_SIZE(driverAttempts); driver++) {
         D3D_FEATURE_LEVEL i_feature_level;
         hr = D3D11CreateDevice(NULL, driverAttempts[driver], NULL, creationFlags,
                     D3D11_features, ARRAY_SIZE(D3D11_features), D3D11_SDK_VERSION,