diff options
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 82fe4f8550..540fedb132 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -84,7 +84,7 @@ extern struct vo_driver video_out_vdpau; extern struct vo_driver video_out_xv; extern struct vo_driver video_out_gl_nosw; extern struct vo_driver video_out_gl; -extern struct vo_driver video_out_gl_sdl; +extern struct vo_driver video_out_gl3; extern struct vo_driver video_out_dga; extern struct vo_driver video_out_sdl; extern struct vo_driver video_out_3dfx; @@ -103,6 +103,7 @@ extern struct vo_driver video_out_caca; extern struct vo_driver video_out_mpegpes; extern struct vo_driver video_out_yuv4mpeg; extern struct vo_driver video_out_direct3d; +extern struct vo_driver video_out_direct3d_shaders; extern struct vo_driver video_out_directx; extern struct vo_driver video_out_kva; extern struct vo_driver video_out_dxr3; @@ -128,12 +129,13 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_TDFX_VID &video_out_tdfx_vid, #endif -#ifdef CONFIG_DIRECTX - &video_out_directx, -#endif #ifdef CONFIG_DIRECT3D + &video_out_direct3d_shaders, &video_out_direct3d, #endif +#ifdef CONFIG_DIRECTX + &video_out_directx, +#endif #ifdef CONFIG_KVA &video_out_kva, #endif @@ -167,6 +169,9 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_XV &video_out_xv, #endif +#ifdef CONFIG_GL + &video_out_gl3, +#endif #ifdef CONFIG_X11 #ifdef CONFIG_GL &video_out_gl_nosw, @@ -180,9 +185,6 @@ const struct vo_driver *video_out_drivers[] = #if (defined CONFIG_GL && !defined CONFIG_GL_COCOA) &video_out_gl, #endif -#ifdef CONFIG_GL_SDL - &video_out_gl_sdl, -#endif #ifdef CONFIG_DGA &video_out_dga, #endif |