From 690b20b9f4efdfb1fc22fa49ec2a0bebd8c372cc Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Wed, 3 Dec 2014 08:02:58 +0000 Subject: [PATCH] glcontext: try cgl before glx It was already done by commit f506e80686eedc66912583db11914ec3f713b478 but it has been broken by commit 45ec777cea0e69b2597d1ec02b18ec31d618c920 --- gst-libs/gst/gl/gstglcontext.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index 1136b8d..35fc9c0 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -275,6 +275,10 @@ gst_gl_context_new (GstGLDisplay * display) user_choice = g_getenv ("GST_GL_PLATFORM"); GST_INFO ("creating a context, user choice:%s", user_choice); +#if GST_GL_HAVE_PLATFORM_CGL + if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl"))) + context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ()); +#endif #if GST_GL_HAVE_PLATFORM_GLX if (!context && (!user_choice || g_strstr_len (user_choice, 3, "glx"))) context = GST_GL_CONTEXT (gst_gl_context_glx_new ()); @@ -283,10 +287,6 @@ gst_gl_context_new (GstGLDisplay * display) if (!context && (!user_choice || g_strstr_len (user_choice, 7, "egl"))) context = GST_GL_CONTEXT (gst_gl_context_egl_new ()); #endif -#if GST_GL_HAVE_PLATFORM_CGL - if (!context && (!user_choice || g_strstr_len (user_choice, 5, "cgl"))) - context = GST_GL_CONTEXT (gst_gl_context_cocoa_new ()); -#endif #if GST_GL_HAVE_PLATFORM_WGL if (!context && (!user_choice || g_strstr_len (user_choice, 3, "wgl"))) { context = GST_GL_CONTEXT (gst_gl_context_wgl_new ()); -- 2.7.4