- direct3d: video output module based on Direct3D9 APIs (this module will be the default on Vista)

configure.ac

@@ -3856,11 +3856,15 @@ then
       AC_CHECK_HEADERS(ddraw.h,
       [ VLC_ADD_PLUGINS([vout_directx aout_directx])
         VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
-        dnl to be moved when dependance is removed
-        AC_CHECK_HEADERS(GL/gl.h, [
-            VLC_ADD_PLUGINS([glwin32])
-            VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
-        ]) ])
+      ])
+      AC_CHECK_HEADERS(GL/gl.h,
+      [ VLC_ADD_PLUGINS([glwin32])
+        VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
+      ])
+      AC_CHECK_HEADERS(d3d9.h,
+      [ VLC_ADD_PLUGINS([direct3d])
+        VLC_ADD_LDFLAGS([direct3d],[-lgdi32])
+      ])
     else
       AC_MSG_CHECKING(for directX headers in ${with_directx})
       if test -f ${with_directx}/ddraw.h

modules/video_output/directx/Modules.am

@@ -4,6 +4,12 @@ SOURCES_vout_directx = \
 	events.c \
 	$(NULL)
 
+SOURCES_direct3d = \
+	direct3d.c \
+	vout.h \
+	events.c \
+	$(NULL)
+
 SOURCES_glwin32 = \
 	glwin32.c \
 	vout.h \

modules/video_output/directx/events.c

@@ -47,6 +47,9 @@
 #ifdef MODULE_NAME_IS_vout_directx
 #include <ddraw.h>
 #endif
+#ifdef MODULE_NAME_IS_direct3d
+#include <d3d9.h>
+#endif
 #ifdef MODULE_NAME_IS_glwin32
 #include <GL/gl.h>
 #endif
@@ -307,6 +310,9 @@ void E_(DirectXEventThread)( event_thread_t *p_event )
 #ifdef MODULE_NAME_IS_glwin32
                 val.psz_string = strdup( VOUT_TITLE " (OpenGL output)" );
 #endif
+#ifdef MODULE_NAME_IS_direct3d
+                val.psz_string = strdup( VOUT_TITLE " (Direct3D output)" );
+#endif
 #ifdef MODULE_NAME_IS_vout_directx
                 if( p_event->p_vout->p_sys->b_using_overlay ) val.psz_string = 
                 strdup( VOUT_TITLE " (hardware YUV overlay DirectX output)" );

modules/video_output/directx/vout.h

@@ -121,6 +121,12 @@ struct vout_sys_t
     HGLRC hGLRC;
 #endif
 
+#ifdef MODULE_NAME_IS_direct3d
+    LPDIRECT3D9             p_d3dobj;
+    LPDIRECT3DDEVICE9       p_d3ddev;
+    D3DPRESENT_PARAMETERS   d3dpp;
+    HINSTANCE               hd3d9_dll;       /* handle of the opened d3d9 dll */
+#endif
     event_thread_t *p_event;
     vlc_mutex_t    lock;
 };