[vlc-commits] direct3d11: don't use D3D11 automatically on OSes older than Win8.1

Steve Lhomme git at videolan.org
Tue Aug 7 09:13:04 CEST 2018


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jul 31 15:18:16 2018 +0200| [3ec6e0859bf9b41dfb4c464d18873a98a05779c0] | committer: Steve Lhomme

direct3d11: don't use D3D11 automatically on OSes older than Win8.1

(cherry picked from commit 0d6753dc907403e96db82e3d702a4633832be697)

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

 modules/video_output/win32/direct3d11.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index d9834bb8c7..49befa7601 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -36,6 +36,7 @@
 
 #include <assert.h>
 #include <math.h>
+#include <versionhelpers.h>
 
 #define COBJMACROS
 #include <initguid.h>
@@ -513,6 +514,10 @@ static int Open(vlc_object_t *object)
 {
     vout_display_t *vd = (vout_display_t *)object;
 
+    /* Allow using D3D11 automatically starting from Windows 8.1 */
+    if (!vd->obj.force && !IsWindows8Point1OrGreater())
+        return VLC_EGENERIC;
+
 #if !VLC_WINSTORE_APP
     int ret = OpenHwnd(vd);
 #else



More information about the vlc-commits mailing list