1 files changed, 18 insertions, 14 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index d0cd991e8b..b49e5b095f 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -83,7 +83,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;
@@ -102,6 +102,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,22 +169,19 @@ const struct vo_driver *video_out_drivers[] =
 #ifdef CONFIG_XV
         &video_out_xv,
 #endif
-#ifdef CONFIG_X11
 #ifdef CONFIG_GL
-        &video_out_gl_nosw,
+        &video_out_gl3,
+#if !defined CONFIG_GL_COCOA
+        &video_out_gl,
 #endif
+#endif
+#ifdef CONFIG_X11
         &video_out_x11,
         &video_out_xover,
 #endif
 #ifdef CONFIG_SDL
         &video_out_sdl,
 #endif
-#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
@@ -222,6 +221,9 @@ const struct vo_driver *video_out_drivers[] =
 #endif
         &video_out_null,
         // should not be auto-selected
+#ifdef CONFIG_SHAREDBUFFER
+        &video_out_sharedbuffer,
+#endif
 #ifdef CONFIG_DIRECTFB
         // vo directfb can call exit() if initialization fails
         &video_out_directfb,
@@ -246,8 +248,10 @@ const struct vo_driver *video_out_drivers[] =
 #ifdef CONFIG_MD5SUM
         &video_out_md5sum,
 #endif
-#ifdef CONFIG_SHAREDBUFFER
-        &video_out_sharedbuffer,
+#ifdef CONFIG_X11
+#ifdef CONFIG_GL
+        &video_out_gl_nosw,
+#endif
 #endif
         NULL
 };