vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jun 17 12:20:50 2015 +0200| [3e5d911b84f4c33e55b3eadfc1ee9608bf70cc79] | committer: Jean-Baptiste Kempf
direct3d11: use the D3D11 types as D3D9 is not available on some platforms Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e5d911b84f4c33e55b3eadfc1ee9608bf70cc79 --- modules/video_output/msw/direct3d11.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c index 7b2ed90..e7b321b 100644 --- a/modules/video_output/msw/direct3d11.c +++ b/modules/video_output/msw/direct3d11.c @@ -32,7 +32,7 @@ #define COBJMACROS #define INITGUID #include <d3d11.h> -#include <d3dx9math.h> +#include <d3dtypes.h> /* avoided until we can pass ISwapchainPanel without c++/cx mode # include <windows.ui.xaml.media.dxinterop.h> */ @@ -120,8 +120,11 @@ typedef struct /* matches the D3D11_INPUT_ELEMENT_DESC we setup */ typedef struct d3d_vertex_t { - D3DXVECTOR3 position; - D3DXVECTOR2 texture; + D3DVECTOR position; + struct { + D3DVALUE x; + D3DVALUE y; + } texture; FLOAT opacity; } d3d_vertex_t; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
