[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: avoid some a ton of D3D11 warnings

[François Cartegnie (@fcartegnie)]

François Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
8c5672ce by Steve Lhomme at 2022-01-08T11:55:54+00:00
qt: avoid some a ton of D3D11 warnings

mingw/wine define some things that the C++ compilers don't like.

We currently don't use these helpers anyway.

- - - - -
57c90009 by Steve Lhomme at 2022-01-08T11:55:54+00:00
d3d11: avoid some a ton of D3D11 warnings

mingw/wine define some things that the C++ compilers don't like.

We currently don't use these helpers anyway.

Also clean the includes since we always end up including d3d11.h in d3d11_xxx.h
headers.

- - - - -


8 changed files:

- modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp
- modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp
- modules/gui/qt/maininterface/compositor_win7.cpp
- modules/video_chroma/d3d11_fmt.h
- modules/video_output/win32/d3d11_quad.cpp
- modules/video_output/win32/d3d11_shaders.cpp
- modules/video_output/win32/d3d11_swapchain.cpp
- modules/video_output/win32/direct3d11.cpp


Changes:

=====================================
modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp
=====================================
@@ -32,6 +32,7 @@
 #  define _WIN32_WINNT 0x0603
 # endif
 
+#define D3D11_NO_HELPERS  // avoid tons of warnings
 #include <dcomp.h>
 #include <d3d11.h>
 #include <wrl.h>


=====================================
modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp
=====================================
@@ -29,6 +29,7 @@
 
 #include <windows.h>
 
+#define D3D11_NO_HELPERS  // avoid tons of warnings
 #include <d3d11_1.h>
 #include <dcomp.h>
 #include <wrl.h>


=====================================
modules/gui/qt/maininterface/compositor_win7.cpp
=====================================
@@ -19,6 +19,7 @@
 #include "mainctx_win32.hpp"
 #include "mainui.hpp"
 
+#define D3D11_NO_HELPERS  // avoid tons of warnings
 #include <d3d11.h>
 
 #include <dwmapi.h>


=====================================
modules/video_chroma/d3d11_fmt.h
=====================================
@@ -25,6 +25,10 @@
 
 #include <vlc_codec.h>
 
+#ifdef __cplusplus
+// avoid some warnings in mingw
+#define D3D11_NO_HELPERS
+#endif
 #include <d3d11.h>
 
 #include "dxgi_fmt.h"


=====================================
modules/video_output/win32/d3d11_quad.cpp
=====================================
@@ -27,8 +27,6 @@
 #include <cassert>
 #include <vlc_common.h>
 
-#include <d3d11.h>
-
 #include "d3d11_quad.h"
 #include "common.h"
 


=====================================
modules/video_output/win32/d3d11_shaders.cpp
=====================================
@@ -28,9 +28,6 @@
 
 #include <cassert>
 
-#define COBJMACROS
-#include <d3d11.h>
-
 #include "d3d11_shaders.h"
 #include "d3d_dynamic_shader.h"
 


=====================================
modules/video_output/win32/d3d11_swapchain.cpp
=====================================
@@ -35,8 +35,6 @@
 
 #include <windows.h>
 
-#include <d3d11.h>
-
 #include "dxgi_swapchain.h"
 #include "d3d11_swapchain.h"
 #include "d3d11_shaders.h"


=====================================
modules/video_output/win32/direct3d11.cpp
=====================================
@@ -39,16 +39,11 @@
 #include <math.h>
 #include <new>
 
-#include <d3d11.h>
+#include "../../video_chroma/d3d11_fmt.h"
 #ifdef HAVE_D3D11_4_H
 #include <d3d11_4.h>
 #endif
 
-/* avoided until we can pass ISwapchainPanel without c++/cx mode
-# include <windows.ui.xaml.media.dxinterop.h> */
-
-#include "../../video_chroma/d3d11_fmt.h"
-
 #include "d3d11_quad.h"
 #include "d3d11_shaders.h"
 #include "d3d11_swapchain.h"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/132e75a56dec62415c5babea72f469e06bee7fcf...57c90009a3bd08627da2f59a33b1e4de735707c6

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/132e75a56dec62415c5babea72f469e06bee7fcf...57c90009a3bd08627da2f59a33b1e4de735707c6
You're receiving this email because of your account on code.videolan.org.